[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/05/07 03:27 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r46905 | guy | 2013-01-02 14:56:24 -0800 (Wed, 02 Jan 2013) | 9 lines
   Changed paths:
      M /trunk/wiretap/netscreen.c
 
   Update TODO list - the first two items are done, and with stuff added to
   support pcap-NG we might have a better way of doing the third item (more
   stuff is needed, but that stuff belongs there for pcap-NG, too).
 
   When parsing hex dump lines, skip leading white space, and skip lines
   that have nothing but white space, rather than guessing where the hex
   dump information ends based on the line length.  Parse the hex bytes
   manually.
   ------------------------------------------------------------------------
   r48159 | cmaynard | 2013-03-06 18:04:41 -0800 (Wed, 06 Mar 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-hdfsdata.c
 
   Avoid a potential divide-by-zero condition.
   #BACKPORT(1.8)
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r43547 | morriss | 2012-06-29 14:18:35 -0700 (Fri, 29 Jun 2012) | 1 line
   Changed paths:
      M /trunk/ui/gtk/capture_dlg.c
 
   Clean up capture option tooltip spacing and remove an extraneous word (at the end of the monitor mode description).  Also use sizeof for a buffer size.
   ------------------------------------------------------------------------
   r45687 | etxrab | 2012-10-21 08:01:23 -0700 (Sun, 21 Oct 2012) | 1 line
   Changed paths:
      M /trunk/asn1/gsm_map/packet-gsm_map-template.c
      M /trunk/epan/dissectors/packet-gsm_map.c
 
   AddressString can have a size of 1, fixes Bug 7882 -GSM_MAP show malformed Packets when two IMSI https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7882
   ------------------------------------------------------------------------
   r48261 | jake | 2013-03-11 23:53:39 -0700 (Mon, 11 Mar 2013) | 3 lines
   Changed paths:
      M /trunk/Makefile.am
      M /trunk/epan/Makefile.am
      M /trunk/epan/crypt/Makefile.am
      M /trunk/epan/dfilter/Makefile.am
      M /trunk/epan/dissectors/Makefile.am
      M /trunk/epan/ftypes/Makefile.am
      M /trunk/epan/wmem/Makefile.am
      M /trunk/epan/wslua/Makefile.am
      M /trunk/epan/wspython/Makefile.am
      M /trunk/plugins/asn1/Makefile.am
      M /trunk/plugins/docsis/Makefile.am
      M /trunk/plugins/ethercat/Makefile.am
      M /trunk/plugins/gryphon/Makefile.am
      M /trunk/plugins/irda/Makefile.am
      M /trunk/plugins/m2m/Makefile.am
      M /trunk/plugins/mate/Makefile.am
      M /trunk/plugins/opcua/Makefile.am
      M /trunk/plugins/profinet/Makefile.am
      M /trunk/plugins/stats_tree/Makefile.am
      M /trunk/plugins/tpg/Makefile.am
      M /trunk/plugins/unistim/Makefile.am
      M /trunk/plugins/wimax/Makefile.am
      M /trunk/plugins/wimaxasncp/Makefile.am
      M /trunk/plugins/wimaxmacphy/Makefile.am
      M /trunk/wiretap/Makefile.am
      M /trunk/wsutil/Makefile.am
 
   From David Arnold:
   Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.8/plugins/asn1/
  Changes    Path           Action
  +1 -1      Makefile.am    Modified

Directory: /trunk-1.8/epan/crypt/
  Changes    Path           Action
  +1 -1      Makefile.am    Modified

Directory: /trunk-1.8/epan/dfilter/
  Changes    Path           Action
  +1 -1      Makefile.am    Modified

Directory: /trunk-1.8/epan/dissectors/
  Changes    Path                 Action
  +1 -1      Makefile.am          Modified
  +9 -6      packet-gsm_map.c     Modified
  +5 -1      packet-hdfsdata.c    Modified

Directory: /trunk-1.8/docbook/
  Changes    Path                 Action
  +21 -9     release-notes.xml    Modified

Directory: /trunk-1.8/plugins/docsis/
  Changes    Path           Action
  +1 -1      Makefile.am    Modified

Directory: /trunk-1.8/epan/
  Changes    Path           Action
  +1 -1      Makefile.am    Modified

Directory: /trunk-1.8/plugins/ethercat/
  Changes    Path           Action
  +1 -1      Makefile.am    Modified


(20 files not shown)