[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/12/13 09:47 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r53247 | martink | 2013-11-11 02:57:30 -0800 (Mon, 11 Nov 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-mongo.c
 
   fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9409
   don't call proto_item_get_len() when the argument can be NULL
   ------------------------------------------------------------------------
   r53257 | pascal | 2013-11-11 12:04:27 -0800 (Mon, 11 Nov 2013) | 3 lines
   Changed paths:
      M /trunk/epan/follow.c
 
   From doh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9112 :
   Fix incorrect "bytes missing in capture file" in "check_fragments"
   ------------------------------------------------------------------------
   r53398 | pascal | 2013-11-17 07:57:51 -0800 (Sun, 17 Nov 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-selfm.c
 
   From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9435 :
   SEL Fast Message bug fix for signed 16-bit integer fast meter messages
   ------------------------------------------------------------------------
   r53399 | pascal | 2013-11-17 08:40:25 -0800 (Sun, 17 Nov 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dnp.c
 
   From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9442 :
   DNP3 bug fix for analog data sign bit bandling
   ------------------------------------------------------------------------
   r53608 | cmaynard | 2013-11-26 19:02:51 -0800 (Tue, 26 Nov 2013) | 3 lines
   Changed paths:
      M /trunk/ui/gtk/capture_dlg.c
 
   Make "Use promiscuous mode on all interfaces" toggle button work properly again.
   #BACKPORT(1.10)
   ------------------------------------------------------------------------
   r53609 | cmaynard | 2013-11-26 21:03:31 -0800 (Tue, 26 Nov 2013) | 3 lines
   Changed paths:
      M /trunk/ui/gtk/capture_dlg.c
 
   Make "Capture on all interfaces" toggle button behave properly, particularly when all interfaces had been selected but one of them is deselected.
   #BACKPORT(1.10)
   ------------------------------------------------------------------------
   r53610 | cmaynard | 2013-11-26 21:13:22 -0800 (Tue, 26 Nov 2013) | 2 lines
   Changed paths:
      M /trunk/ui/gtk/capture_dlg.c
 
   OK, capture_all is only ever set to TRUE or FALSE, so just use it directly.
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r53611 | cmaynard | 2013-11-26 21:31:10 -0800 (Tue, 26 Nov 2013) | 3 lines
   Changed paths:
      M /trunk/ui/gtk/capture_dlg.c
 
   While r53608 fixed the "Use promiscuous mode on all interfaces" toggle button behavior, it wasn't enough, so use the technique from r53609 for the "Capture on all interfaces" toggle button to fix it completely.
   #BACKPORT(1.10)
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.10/epan/dissectors/
  Changes    Path              Action
  +26 -24    packet-dnp.c      Modified
  +2 -5      packet-mongo.c    Modified
  +2 -1      packet-selfm.c    Modified

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

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

Directory: /trunk-1.10/ui/gtk/
  Changes    Path             Action
  +12 -9     capture_dlg.c    Modified