[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/07/22 02:52 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r50455 | etxrab | 2013-07-08 21:22:43 -0700 (Mon, 08 Jul 2013) | 6 lines
   Changed paths:
      M /trunk/epan/prefs.c
      M /trunk/ui/gtk/capture_dlg.c
      M /trunk/ui/gtk/prefs_capture.c
 
   From Cal Turney:
    Wireshark crashes when switching from a v1.11.0 profile to a v1.4.6 prof and then to a v1.5.1 profile.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8884
 
   #BACKPORT 1.10
   ------------------------------------------------------------------------
   r50457 | etxrab | 2013-07-08 22:14:33 -0700 (Mon, 08 Jul 2013) | 2 lines
   Changed paths:
      M /trunk/epan/prefs.c
 
   prefs.c: In function 'capture_column_set_cb':
   prefs.c:1745: warning: unused variable 'syntax_error'
   ------------------------------------------------------------------------
   r50480 | etxrab | 2013-07-09 22:00:43 -0700 (Tue, 09 Jul 2013) | 6 lines
   Changed paths:
      M /trunk/ui/cli/tap-sipstat.c
 
   From Joe McEachern:
   SIP stats shows incorrect values for Max/Ave setup times.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8897
 
   BACKPORT 1.8 1.10
   ------------------------------------------------------------------------
   r50483 | stig | 2013-07-10 09:33:30 -0700 (Wed, 10 Jul 2013) | 4 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_proto.c
 
   Use luaL_optnumber for ProtoField mask, to avoid a signed cast.
 
   This fixes bug 5734.
   ------------------------------------------------------------------------
   r50510 | cmaynard | 2013-07-11 08:55:52 -0700 (Thu, 11 Jul 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-slsk.c
 
   Fix an obvious case of incorrectly comparing the return value of tvb_length_remaining() against non-zero instead of greater than zero.  There are other questionable uses of tvb_length_remaining() as well ... and maybe these should all be replaced with tvb_reported_length_remaining() as well?
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r50602 | morriss | 2013-07-14 21:00:20 -0700 (Sun, 14 Jul 2013) | 6 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-nfs.c
 
   From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8920 :
 
   Changed FATTR4_DISSECT_VALUES arg to FATTR4_BITMAP_ONLY in calls to
   dissect_nfs4_fattrs() in cases NFS4_OP_OPEN and NFS4_OP_CREATE of
   dissect_nfs4_response_op().
   ------------------------------------------------------------------------
   r50609 | ruengeler | 2013-07-15 01:58:32 -0700 (Mon, 15 Jul 2013) | 3 lines
   Changed paths:
      M /trunk/ui/gtk/capture_dlg.c
      M /trunk/ui/gtk/prefs_capture.c
 
   Do not hide the interface name in capture options.
   Fix for bug 8932 reported by tdarnell5.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.10/ui/cli/
  Changes    Path             Action
  +1 -1      tap-sipstat.c    Modified

Directory: /trunk-1.10/epan/dissectors/
  Changes    Path             Action
  +2 -2      packet-nfs.c     Modified
  +3 -2      packet-slsk.c    Modified
  +1 -11     packet-smtp.c    Modified

Directory: /trunk-1.10/docbook/
  Changes    Path                      Action
  +29 -0     release-notes.asciidoc    Modified

Directory: /trunk-1.10/epan/
  Changes    Path          Action
  +137 -91   prefs.c       Modified

Directory: /trunk-1.10/ui/gtk/
  Changes    Path               Action
  +17 -17    capture_dlg.c      Modified
  +2 -4      prefs_capture.c    Modified

Directory: /trunk-1.10/epan/wslua/
  Changes    Path             Action
  +3 -3      wslua_proto.c    Modified