[gerald@xxxxxxxxxxxxx]

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

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

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r49326 | etxrab | 2013-05-15 22:08:16 -0700 (Wed, 15 May 2013) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-amr.c
 
   From Neil Piercy:
   AMR Frame Type uses wrong Value String.
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8681
   Applied by hand, patch not against trunk?
   ------------------------------------------------------------------------
   r49330 | morriss | 2013-05-16 07:24:16 -0700 (Thu, 16 May 2013) | 8 lines
   Changed paths:
      M /trunk/AUTHORS
      M /trunk/profiles/Bluetooth/colorfilters
 
   From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8662 :
 
   I want to add last four colours to Profile Bluetooth. This should
   significantly improve readability - rule is one colour for one
   protocol/profile.
 
   Also take responsibility (in the AUTHORS file) for first three dissectors.
   ------------------------------------------------------------------------
   r49332 | cmaynard | 2013-05-16 08:21:42 -0700 (Thu, 16 May 2013) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
 
   Treat invalid checksum of 0x0000 no different than any other invalid checksum.
   Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8629
   #BACKPORT (1.10, 1.8, 1.6)
   ------------------------------------------------------------------------
   r49333 | stig | 2013-05-16 09:31:45 -0700 (Thu, 16 May 2013) | 3 lines
   Changed paths:
      M /trunk/ui/gtk/profile_dlg.c
 
   Only add one "New from Global" entry in the profiles menu.
   (someone removed this when rewriting the code)
   ------------------------------------------------------------------------
   r49361 | morriss | 2013-05-16 17:42:45 -0700 (Thu, 16 May 2013) | 6 lines
   Changed paths:
      M /trunk/ui/gtk/main_menubar.c
      M /trunk/ui/gtk/menus.h
      M /trunk/ui/gtk/profile_dlg.c
      M /trunk/ui/gtk/profile_dlg.h
 
   From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8690 :
 
   Change "Edit" to "Rename" and add icons to "Manage Profiles..." and "Switch
   to...". Update the associated widget, routine, and variable names in order
   to facilitate future maintenance.
   ------------------------------------------------------------------------
   r49379 | morriss | 2013-05-17 07:38:36 -0700 (Fri, 17 May 2013) | 7 lines
   Changed paths:
      M /trunk/epan/tvbuff.c
 
   As suggested by Jakub: don't ep_alloc buffers for TVBs, use g_malloc()'d
   memory with tvb-free-callback.
 
   Fixes one of the "read after free" warnings from Valgrind reported in
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197 and the one reported
   in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8653
   ------------------------------------------------------------------------
   r49409 | martink | 2013-05-18 10:08:46 -0700 (Sat, 18 May 2013) | 9 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-user_encap.c
 
   distinguish between length and reported length when dissecting a packet
   with DLT_USERxy
 
   with this fix, the user-encap dissector hands over truncated packets to
   the defined sub-dissector
 
   (the previous version would assume length==reported length and throw an
   execption for truncated packets)
   ------------------------------------------------------------------------
   r49426 | cmaynard | 2013-05-19 18:53:26 -0700 (Sun, 19 May 2013) | 2 lines
   Changed paths:
      M /trunk/doc/wireshark.pod.template
 
   Add some newlines at the end of the file so the authors are printer properly.
   ------------------------------------------------------------------------
   r49456 | gerald | 2013-05-20 12:04:19 -0700 (Mon, 20 May 2013) | 2 lines
   Changed paths:
      M /trunk/ui/gtk/main_filter_toolbar.c
 
   Fix trimming the maximum number if display filter entries.
   ------------------------------------------------------------------------

Directory: /trunk-1.10/profiles/Bluetooth/
  Changes    Path            Action
  +4 -0      colorfilters    Modified

Directory: /trunk-1.10/epan/dissectors/
  Changes    Path                   Action
  +2 -2      packet-amr.c           Modified
  +4 -18     packet-tcp.c           Modified
  +5 -4      packet-user_encap.c    Modified

Directory: /trunk-1.10/doc/
  Changes    Path                      Action
  +2 -0      wireshark.pod.template    Modified

Directory: /trunk-1.10/epan/
  Changes    Path          Action
  +9 -1      tvbuff.c      Modified

Directory: /trunk-1.10/ui/gtk/
  Changes    Path                     Action
  +8 -9      main_filter_toolbar.c    Modified
  +10 -10    main_menubar.c           Modified
  +2 -2      menus.h                  Modified
  +27 -27    profile_dlg.c            Modified
  +1 -1      profile_dlg.h            Modified


(1 file not shown)