[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/10/29 10:19 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r52403 | mmann | 2013-10-06 08:38:32 -0700 (Sun, 06 Oct 2013) | 3 lines
   Changed paths:
      M /trunk/AUTHORS
      M /trunk/epan/dissectors/packet-3g-a11.c
 
   Improve "eHRPD Indicator" NVSE dissection in 3GPP2 A11 Registration Request. Bug 9206 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9206)
 
   From Masayuki Takemura
   ------------------------------------------------------------------------
   r52493 | morriss | 2013-10-10 07:53:19 -0700 (Thu, 10 Oct 2013) | 8 lines
   Changed paths:
      M /trunk/tshark.c
 
   Fix the core dump reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9258 :
 
   After calling wtap_close(), set the wth to NULL so we don't try to close it
   again later. (The core only happens when tshark isn't keeping up with dumpcap's
   file rotation.)
 
   Wireshark still has a problem but it's a different one.
   ------------------------------------------------------------------------
   r52512 | morriss | 2013-10-10 13:23:59 -0700 (Thu, 10 Oct 2013) | 4 lines
   Changed paths:
      M /trunk/ui/gtk/capture_dlg.c
 
   Don't close the Capture Options window if there was an error in what was
   selected (and we're not going to start capturing).  That way the user can fix
   whatever was wrong without having to re-open the dialog.
   ------------------------------------------------------------------------
   r52566 | pascal | 2013-10-12 07:05:32 -0700 (Sat, 12 Oct 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ptp.c
 
   From Todd Newton via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9262 :
   Fix dissection of PTP Management messages
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r52404 | mmann | 2013-10-06 08:51:31 -0700 (Sun, 06 Oct 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-mq.c
 
   WebSphere MQ V7 Bug Fix 8322 TSHM_EBCDIC.  Bug 9198 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9198)
 
   From Ed Beroset.
   ------------------------------------------------------------------------
   r52773 | rbalint | 2013-10-22 15:33:05 -0700 (Tue, 22 Oct 2013) | 1 line
   Changed paths:
      M /trunk/debian/control
      M /trunk/debian/rules
 
   Generate wsicon32.xpm during building Debian package
   ------------------------------------------------------------------------
   r52659 | kukosa | 2013-10-17 04:24:43 -0700 (Thu, 17 Oct 2013) | 1 line
   Changed paths:
      M /trunk/asn1/h225/h225.cnf
      M /trunk/epan/dissectors/packet-h225.c
      M /trunk/epan/dissectors/packet-h225.h
 
   H.225.0: fix handling of compound parameters in Generic Extensible Framework (H.460.22 did not work well)
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.10/debian/
  Changes    Path          Action
  +1 -1      control       Modified
  +1 -1      rules         Modified

Directory: /trunk-1.10/epan/dissectors/
  Changes    Path               Action
  +34 -1     packet-3g-a11.c    Modified
  +11 -36    packet-h225.c      Modified
  +2 -2      packet-mq.c        Modified
  +1 -1      packet-ptp.c       Modified

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

Directory: /trunk-1.10/ui/gtk/
  Changes    Path             Action
  +1 -0      capture_dlg.c    Modified

Directory: /trunk-1.10/asn1/h225/
  Changes    Path          Action
  +1 -1      h225.cnf      Modified

Directory: /trunk-1.10/
  Changes    Path          Action
  +2 -0      AUTHORS       Modified
  +1 -0      tshark.c      Modified