http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=35424
User: gerald
Date: 2011/01/07 04:35 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r35252 | jake | 2010-12-23 09:45:02 -0800 (Thu, 23 Dec 2010) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-cfm.c
Fix for bug 5517:
MEG ID, ICC-based format is text, not binary.
------------------------------------------------------------------------
r35267 | etxrab | 2010-12-26 13:23:06 -0800 (Sun, 26 Dec 2010) | 4 lines
Changed paths:
M /trunk/epan/dissectors/packet-gsm_a_bssmap.c
Correct:
RESET IP RESOURCE
RESET IP RESOURCE ACKNOWLEDGE
Tags
------------------------------------------------------------------------
r35282 | jake | 2010-12-28 01:30:24 -0800 (Tue, 28 Dec 2010) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-wps.c
From Masashi Honma:
EAP WPS RF band may be '2.4 GHz and 5 GHz'.
------------------------------------------------------------------------
r35287 | cmaynard | 2010-12-28 10:02:24 -0800 (Tue, 28 Dec 2010) | 2 lines
Changed paths:
M /trunk/epan/dissectors/packet-ltp.c
Improve sanity checking of reception claim count. Fixes bug 5521.
------------------------------------------------------------------------
r35291 | guy | 2010-12-28 12:32:58 -0800 (Tue, 28 Dec 2010) | 4 lines
Changed paths:
M /trunk/wiretap/netmon.c
It is not guaranteed that the records in numerical (frame table) order
will be in sequential (byte offset) order in the file; don't treat the
record offset going backwards as an error.
------------------------------------------------------------------------
Copy over by hand:
------------------------------------------------------------------------
r35271 | etxrab | 2010-12-27 01:33:39 -0800 (Mon, 27 Dec 2010) | 1 line
Changed paths:
M /trunk/epan/dissectors/packet-gsm_a_bssmap.c
Fix the Message numbering.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.4/epan/dissectors/
Changes Path Action
+2 -1 packet-cfm.c Modified
+53 -53 packet-gsm_a_bssmap.c Modified
+4 -4 packet-ltp.c Modified
+1 -0 packet-wps.c Modified
Directory: /trunk-1.4/docbook/
Changes Path Action
+17 -15 release-notes.xml Modified
Directory: /trunk-1.4/wiretap/
Changes Path Action
+5 -7 netmon.c Modified