[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=54076

User: gerald
Date: 2013/12/13 10:49 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r53646 | mmann | 2013-11-29 06:55:49 -0800 (Fri, 29 Nov 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gmhdr.c
 
   Bugfix timestamp formatting of Gigamon trailer.  Bug 9433 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9433)
 
   From Sandeep Dahiya
   ------------------------------------------------------------------------
   r53728 | cmaynard | 2013-12-02 11:17:12 -0800 (Mon, 02 Dec 2013) | 3 lines
   Changed paths:
      M /trunk/capture_opts.c
      M /trunk/doc/dumpcap.pod
      M /trunk/doc/tshark.pod
      M /trunk/doc/wireshark.pod.template
      M /trunk/dumpcap.c
      M /trunk/ui/gtk/capture_dlg.c
      M /trunk/ui/gtk/prefs_capture.c
 
   Specify SI units for the max filesize autostop condition.  For now, keep the capture buffer size in IEC units, but document it as such.
   #BACKPORT(1.10, 1.8(?))
   ------------------------------------------------------------------------
   r53838 | mmann | 2013-12-07 17:15:55 -0800 (Sat, 07 Dec 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-iscsi.c
 
   Correctly update the data length of the SCSI payload within ISCSI.  Bug 9521 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9521)
 
   From Yaniv Kaul
   ------------------------------------------------------------------------
   r53845 | mmann | 2013-12-07 18:48:24 -0800 (Sat, 07 Dec 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-rlc.c
 
   RLC dissector cannot assemble PDUs with SNs skipped and wrap-arounded.  Bug 9505 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9505)
 
   From Nobuyuki Tsushima
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r53670 | mmann | 2013-11-29 17:35:03 -0800 (Fri, 29 Nov 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   Tx MCS set is not interpreted properly in WLAN beacon frame.  Bug 8894 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8894)
 
   #BACKPORT
   ------------------------------------------------------------------------
   r53940 | pascal | 2013-12-11 10:47:15 -0800 (Wed, 11 Dec 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gsm_sms.c
 
   From Michael Lum via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9550 :
   GSM SMS UDH EMS control expects 4 octets instead of 3 with OPTIONAL 4th
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.10/epan/dissectors/
  Changes    Path                  Action
  +1 -1      packet-gmhdr.c        Modified
  +10 -3     packet-gsm_sms.c      Modified
  +58 -4     packet-ieee80211.c    Modified
  +1 -0      packet-iscsi.c        Modified
  +62 -26    packet-rlc.c          Modified

Directory: /trunk-1.10/doc/
  Changes    Path                      Action
  +7 -7      dumpcap.pod               Modified
  +7 -7      tshark.pod                Modified
  +9 -9      wireshark.pod.template    Modified

Directory: /trunk-1.10/docbook/
  Changes    Path                      Action
  +9 -0      release-notes.asciidoc    Modified

Directory: /trunk-1.10/ui/gtk/
  Changes    Path               Action
  +18 -18    capture_dlg.c      Modified
  +2 -2      prefs_capture.c    Modified


(2 files not shown)