http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=37985
User: gerald
Date: 2011/07/11 05:14 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r37816 | stig | 2011-06-28 08:18:21 -0700 (Tue, 28 Jun 2011) | 4 lines
Changed paths:
M /trunk/capinfos.c
From Jose Pedro Oliveira via bug 5803:
#ifdef HAVE_LIBGCRYPT block includes a line too many.
"Fixes 2nd instance of the problem"
------------------------------------------------------------------------
r37828 | stig | 2011-06-29 00:02:04 -0700 (Wed, 29 Jun 2011) | 4 lines
Changed paths:
M /trunk/epan/dissectors/packet-rpcap.c
Strengthen heuristics for Packets.
This fixes bug 6073.
------------------------------------------------------------------------
Copy over by hand:
------------------------------------------------------------------------
r37842 | stig | 2011-06-30 02:31:11 -0700 (Thu, 30 Jun 2011) | 2 lines
Changed paths:
M /trunk/epan/dissectors/packet-rpcap.c
Avoid absurdly large values used in for-loops.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.6/epan/dissectors/
Changes Path Action
+19 -0 packet-rpcap.c Modified
Directory: /trunk-1.6/docbook/
Changes Path Action
+15 -15 release-notes.xml Modified
Directory: /trunk-1.6/gtk/
Changes Path Action
+3 -0 capture_dlg.c Modified
Directory: /trunk-1.6/
Changes Path Action
+1 -1 capinfos.c Modified