http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34942
User: gerald
Date: 2010/11/17 05:06 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r34661 | stig | 2010-10-27 00:45:31 -0700 (Wed, 27 Oct 2010) | 4 lines
Changed paths:
M /trunk/gtk/io_stat.c
Calculate correct io->start_time.
This fixes bug 5340.
------------------------------------------------------------------------
r34709 | stig | 2010-10-30 04:43:11 -0700 (Sat, 30 Oct 2010) | 3 lines
Changed paths:
M /trunk/gtk/uat_gui.c
Redissect packets instead of reload file on UAT changes.
This way we can do changes while capturing.
------------------------------------------------------------------------
r34823 | tuexen | 2010-11-09 08:29:15 -0800 (Tue, 09 Nov 2010) | 4 lines
Changed paths:
M /trunk/gtk/sctp_graph_dlg.c
Bugfix from Irene Ruengeler to improve the TSN plot for SCTP
when large gap reports are present.
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r34660 | stig | 2010-10-27 00:44:26 -0700 (Wed, 27 Oct 2010) | 2 lines
Changed paths:
M /trunk/epan/libwireshark.def
M /trunk/epan/nstime.c
M /trunk/epan/nstime.h
Added two new functions: nstime_diff() and nstime_subtract().
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.2/epan/dissectors/
Changes Path Action
+3 -1 packet-nbns.c Modified
Directory: /trunk-1.2/docbook/
Changes Path Action
+12 -6 release-notes.xml Modified
Directory: /trunk-1.2/epan/
Changes Path Action
+2 -0 libwireshark.def Modified
+18 -0 nstime.c Modified
+12 -0 nstime.h Modified
Directory: /trunk-1.2/gtk/
Changes Path Action
+15 -12 file_dlg_win32.c Modified
+1 -1 io_stat.c Modified
+2 -2 sctp_graph_dlg.c Modified
+3 -6 uat_gui.c Modified