[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/07/23 11:09 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r49899 | kukosa | 2013-06-12 02:03:21 -0700 (Wed, 12 Jun 2013) | 1 line
   Changed paths:
      M /trunk/asn1/h235/h235.cnf
      M /trunk/epan/dissectors/packet-h235.c
 
   Fix wrong offset in H.235 tokens causing malformed packet exception
   ------------------------------------------------------------------------
   r49908 | morriss | 2013-06-12 08:50:37 -0700 (Wed, 12 Jun 2013) | 8 lines
   Changed paths:
      M /trunk/ui/gtk/flow_graph.c
 
   From Peter Hatina via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8793 :
 
   Fix crash if you cancel the Flow Graph window while the Graph Analysis window
   is still open: close the Graph Analysis window when the user cancels the Flow
   Graph window.
 
   From me: do the same thing for the window-delete case.
   ------------------------------------------------------------------------
   r49937 | cmaynard | 2013-06-14 10:47:54 -0700 (Fri, 14 Jun 2013) | 3 lines
   Changed paths:
      M /trunk/ui/gtk/gui_utils.c
 
   Ensure that Wireshark isn't obscured by the system taskbar or by any other desktop toolbars.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3034
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r46771 | guy | 2012-12-26 03:27:21 -0800 (Wed, 26 Dec 2012) | 2 lines
   Changed paths:
      M /trunk/ui/win32/print_win32.c
      M /trunk/ui/win32/print_win32.h
 
   Squelch some more discarding-qualifiers warnings.
   ------------------------------------------------------------------------
   r49946 | cmaynard | 2013-06-15 05:57:32 -0700 (Sat, 15 Jun 2013) | 3 lines
   Changed paths:
      M /trunk/ui/win32/print_win32.c
 
   Make use of text metrics and devmode data to properly format a page for printing.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7543
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r49983 | cmaynard | 2013-06-17 08:39:56 -0700 (Mon, 17 Jun 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-pdcp-lte.c
 
   tvb_length_remaining() can return -1 so don't cast its return value to an unsigned type when performing integer comparisons.  Instead, cast strlen()'s return value to a signed type and perform the comparison that way.
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r49984 | pascal | 2013-06-17 11:44:19 -0700 (Mon, 17 Jun 2013) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-mac-lte.c
      M /trunk/epan/dissectors/packet-rlc-lte.c
      M /trunk/epan/dissectors/packet-rlc.c
 
   Apply r49983 to other dissectors
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r49939 | cmaynard | 2013-06-14 10:57:08 -0700 (Fri, 14 Jun 2013) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee802a.c
 
   Fix IEEE802a OUI lookups.
   Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3123
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.8/epan/dissectors/
  Changes    Path                 Action
  +5 -5      packet-h235.c        Modified
  +14 -10    packet-ieee802a.c    Modified
  +1 -1      packet-mac-lte.c     Modified
  +1 -1      packet-pdcp-lte.c    Modified
  +1 -1      packet-rlc-lte.c     Modified
  +1 -1      packet-rlc.c         Modified

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

Directory: /trunk-1.8/ui/gtk/
  Changes    Path            Action
  +21 -2     flow_graph.c    Modified
  +35 -0     gui_utils.c     Modified

Directory: /trunk-1.8/asn1/h235/
  Changes    Path          Action
  +5 -5      h235.cnf      Modified


(2 files not shown)