[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/01/25 10:50 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r46958 | pascal | 2013-01-05 15:49:24 -0800 (Sat, 05 Jan 2013) | 3 lines
   Changed paths:
      M /trunk/epan/proto.c
 
   From Nickolai via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8167 :
   Fix an incorrect logical check for no_of_bits!=0 in proto_tree_add_split_bits_item_ret_val()
   ------------------------------------------------------------------------
   r47036 | pascal | 2013-01-11 12:18:32 -0800 (Fri, 11 Jan 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gtp.c
 
   Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 :
   Add dissection of Dual Address Bearer Flag bit in Common Flags IE
   ------------------------------------------------------------------------
   r47071 | pascal | 2013-01-14 10:29:27 -0800 (Mon, 14 Jan 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gtpv2.c
 
   Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8208 :
   Display ECI and LAC in decimal and fix highlighting of CGI, SAI, RAI, TAI, ECGI and LAI fields
   ------------------------------------------------------------------------
   r47112 | mmann | 2013-01-16 05:27:23 -0800 (Wed, 16 Jan 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-etherip.c
 
   Bugfix version number in EtherIP dissector + general cleanup.  Bug 8211 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8211)
 
   #BACKPORT
   ------------------------------------------------------------------------
   r47132 | pascal | 2013-01-17 05:20:45 -0800 (Thu, 17 Jan 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dis-pdus.c
 
   From Hendrik Uhlmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8227 :
    Electromagnetic Emission Parser parses field Event Id as Entity Id
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r46433 | gerald | 2012-12-06 16:39:28 -0800 (Thu, 06 Dec 2012) | 2 lines
   Changed paths:
      M /trunk/ui/gtk/main_menubar.c
 
   Fix an apparent copy/paste error.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.8/epan/dissectors/
  Changes    Path                 Action
  +1 -1      packet-dis-pdus.c    Modified
  +26 -23    packet-etherip.c     Modified
  +16 -8     packet-gtp.c         Modified
  +8 -8      packet-gtpv2.c       Modified

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

Directory: /trunk-1.8/epan/
  Changes    Path          Action
  +1 -1      proto.c       Modified

Directory: /trunk-1.8/ui/gtk/
  Changes    Path              Action
  +1 -2      main_menubar.c    Modified