Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] rev 37251: /trunk-1.4/ /trunk-1.4/epan/dissectors/: packet-i

Date: Wed, 18 May 2011 18:21:36 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=37251

User: gerald
Date: 2011/05/18 11:21 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r36975 | guy | 2011-05-03 02:14:56 -0700 (Tue, 03 May 2011) | 5 lines
   Changed paths:
      M /trunk/wiretap/netmon.c
 
   Note what NetMon 3 actually uses various types for.
 
   For the ones that are used for raw IP, use WTAP_ENCAP_RAW_IP.  (Yes,
   NetMon checks for v4 vs. v6 for all of them.)
   ------------------------------------------------------------------------
   r36997 | cmaynard | 2011-05-05 07:20:22 -0700 (Thu, 05 May 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-iec104.c
 
   Fix decoding of CP56Time2a timestamp.  Resolves bug 5889.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path               Action
  +2 -2      packet-iec104.c    Modified

Directory: /trunk-1.4/docbook/
  Changes    Path                 Action
  +17 -2     release-notes.xml    Modified

Directory: /trunk-1.4/wiretap/
  Changes    Path          Action
  +5 -5      netmon.c      Modified