------------------------------------------------------------------------
r54192 | gerald | 2013-12-17 12:03:59 -0800 (Tue, 17 Dec 2013) | 2 lines
Changed paths:
   M /trunk-1.10/ChangeLog
   M /trunk-1.10/config.nmake
   M /trunk-1.10/configure.ac
   M /trunk-1.10/debian/changelog
   M /trunk-1.10/docbook/asciidoc.conf
   M /trunk-1.10/docbook/release-notes.asciidoc
   M /trunk-1.10/epan/Makefile.am
   M /trunk-1.10/make-version.pl
   M /trunk-1.10/version.conf
   M /trunk-1.10/wiretap/Makefile.am

1.10.4 → 1.10.5.

------------------------------------------------------------------------
r54196 | wmeier | 2013-12-17 13:18:15 -0800 (Tue, 17 Dec 2013) | 13 lines
Changed paths:
   M /trunk-1.10/dumpcap.c

Copy over from Trunk

 ------------------------------------------------------------------------
 r54181 | wmeier | 2013-12-17 10:02:47 -0500 (Tue, 17 Dec 2013) | 8 lines

 From "bd": Fix " Wireshark stops showing new packets but dumpcap keeps writing them to the temp file"

 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9571

 From me: Fixed in a slightly different manner than sugested in the patch attached to the bug.
 ------------------------------------------------------------------------


------------------------------------------------------------------------
r54217 | mmann | 2013-12-18 05:15:13 -0800 (Wed, 18 Dec 2013) | 3 lines
Changed paths:
   M /trunk-1.10/epan/dissectors/packet-bitcoin.c

Bugfix port number endianness.  Bug 9530 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9530)

Taken from part of r52609 enhancement.
------------------------------------------------------------------------
r54225 | cmaynard | 2013-12-18 08:31:29 -0800 (Wed, 18 Dec 2013) | 2 lines
Changed paths:
   M /trunk-1.10/ui/gtk/capture_dlg.c

Something went wrong with the backport of r53608 + r53611.  Fix it.

------------------------------------------------------------------------
r54252 | gerald | 2013-12-19 09:31:09 -0800 (Thu, 19 Dec 2013) | 30 lines
Changed paths:
   M /trunk-1.10
   M /trunk-1.10/docbook/release-notes.asciidoc
   M /trunk-1.10/epan/dissectors/packet-gsm_a_bssmap.c
   M /trunk-1.10/epan/dissectors/packet-gsm_bssmap_le.c
   M /trunk-1.10/epan/dissectors/packet-gsm_sms.c
   M /trunk-1.10/epan/dissectors/packet-homeplug.c
   M /trunk-1.10/epan/dissectors/packet-nas_eps.c
   M /trunk-1.10/epan/dissectors/packet-sgsap.c

Copy over r54227 from the trunk:

  ------------------------------------------------------------------------
  r54227 | cmaynard | 2013-12-18 10:27:07 -0800 (Wed, 18 Dec 2013) | 4 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-homeplug.c

  Call ptvcursor_new() to initialize cursor whether tree is NULL or not.
  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9578
  #BACKPORT(1.10, 1.8)
  ------------------------------------------------------------------------


Copy over the non-BSSGP portions of r49145 with manual intervention:
  ------------------------------------------------------------------------
  r49145 | mmann | 2013-05-03 07:54:39 -0700 (Fri, 03 May 2013) | 1 line
  Changed paths:
     M /trunk/epan/dissectors/packet-bssgp.c
     M /trunk/epan/dissectors/packet-gsm_a_bssmap.c
     M /trunk/epan/dissectors/packet-gsm_bssmap_le.c
     M /trunk/epan/dissectors/packet-gsm_sms.c
     M /trunk/epan/dissectors/packet-nas_eps.c
     M /trunk/epan/dissectors/packet-sgsap.c

  Remove static packet_info *gpinfo and just use the packet_info provided by the function.
  ------------------------------------------------------------------------


Update the release notes.

------------------------------------------------------------------------
r54253 | gerald | 2013-12-19 09:40:32 -0800 (Thu, 19 Dec 2013) | 2 lines
Changed paths:
   M /trunk-1.10/docbook/release-notes.asciidoc

Remove duplicate entry.

------------------------------------------------------------------------
r54258 | cmaynard | 2013-12-19 09:59:14 -0800 (Thu, 19 Dec 2013) | 13 lines
Changed paths:
   M /trunk-1.10/epan/dissectors/packet-omapi.c
   M /trunk-1.10/epan/dissectors/packet-pgm.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r54255 | cmaynard | 2013-12-19 12:48:11 -0500 (Thu, 19 Dec 2013) | 2 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-omapi.c
     M /trunk/epan/dissectors/packet-pgm.c

  Fix leaks where ptvcursor_free() wasn't being called.

  ------------------------------------------------------------------------


------------------------------------------------------------------------
r54259 | cmaynard | 2013-12-19 10:02:03 -0800 (Thu, 19 Dec 2013) | 12 lines
Changed paths:
   M /trunk-1.10/epan/dissectors/packet-roofnet.c

Copy over revisions from the trunk:

  ------------------------------------------------------------------------
  r54257 | cmaynard | 2013-12-19 12:48:58 -0500 (Thu, 19 Dec 2013) | 2 lines
  Changed paths:
     M /trunk/epan/dissectors/packet-roofnet.c

  Need to call ptvcursor_current_offset() BEFORE ptvcursor_free().

  ------------------------------------------------------------------------


------------------------------------------------------------------------
