http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=38089
User: gerald
Date: 2011/07/18 09:40 AM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r38023 | wmeier | 2011-07-14 12:51:53 -0700 (Thu, 14 Jul 2011) | 6 lines
Changed paths:
M /trunk/gtk/rtp_player.c
Fix a crash when doing Telephony ! RTP ! Stream Analysis with capture files with truncated frames.
(That is: the capture files were created with a snapshot length less than the maximum).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6120
------------------------------------------------------------------------
r38070 | stig | 2011-07-17 10:56:42 -0700 (Sun, 17 Jul 2011) | 1 line
Changed paths:
M /trunk/epan/wspython/register-dissector.py
Check for a valid wspy_dissectors disectory to avoid a warning if missing.
------------------------------------------------------------------------
r38072 | guy | 2011-07-17 13:23:07 -0700 (Sun, 17 Jul 2011) | 2 lines
Changed paths:
M /trunk/packaging/macosx/osx-app.sh
Handle versions of GTK+ where gdk-pixbuf is a separate library.
------------------------------------------------------------------------
Copy over by hand:
------------------------------------------------------------------------
r38064 | stig | 2011-07-16 11:30:57 -0700 (Sat, 16 Jul 2011) | 3 lines
Changed paths:
M /trunk/epan/prefs.c
Improved check for valid custom column in preferences.
This fixes bug 6131.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.4/docbook/
Changes Path Action
+24 -0 release-notes.xml Modified
Directory: /trunk-1.4/epan/
Changes Path Action
+8 -2 prefs.c Modified
Directory: /trunk-1.4/gtk/
Changes Path Action
+1 -1 rtp_player.c Modified
Directory: /trunk-1.4/packaging/macosx/
Changes Path Action
+30 -1 osx-app.sh Modified
Directory: /trunk-1.4/
Changes Path Action
+62 -37 NEWS Modified
Directory: /trunk-1.4/epan/wspython/
Changes Path Action
+5 -0 register-dissector.py Modified