http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=49190
User: gerald
Date: 2013/05/06 04:31 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r49154 | mmann | 2013-05-03 19:20:59 -0700 (Fri, 03 May 2013) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-lisp-data.c
M /trunk/epan/dissectors/packet-lisp.c
LISP control packet incorrectly identified as LISP data based when UDP source port is 4341. Bug 8627 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8627)
Also did some minor cleanup/improvements while I was there.
------------------------------------------------------------------------
r49170 | mmann | 2013-05-05 04:02:42 -0700 (Sun, 05 May 2013) | 1 line
Changed paths:
M /trunk/epan/dissectors/packet-lisp-data.c
Remove if (tree) so expert_info will always be called.
------------------------------------------------------------------------
r49166 | rbalint | 2013-05-04 22:25:35 -0700 (Sat, 04 May 2013) | 1 line
Changed paths:
M /trunk/ui/gtk/filter_dlg.c
Really change display filter combo box's background color using GTK3
------------------------------------------------------------------------
r49084 | gerald | 2013-04-29 10:13:24 -0700 (Mon, 29 Apr 2013) | 2 lines
Changed paths:
M /trunk/colorfilters
Darken and saturate the "trouble" backgrounds a bit.
------------------------------------------------------------------------
r49116 | gerald | 2013-05-01 13:31:50 -0700 (Wed, 01 May 2013) | 4 lines
Changed paths:
M /trunk/colorfilters
A /trunk/profiles
A /trunk/profiles/Bluetooth
A /trunk/profiles/Bluetooth/colorfilters
A /trunk/profiles/Classic
A /trunk/profiles/Classic/colorfilters
Add a "profiles" directory. Add a Bluetooth global profile with the
current default+Bluetooth colors and a Classic global profile with the
old 1.8 colors. Remove the Bluetooth rules from the default profile.
------------------------------------------------------------------------
r49122 | gerald | 2013-05-01 14:53:57 -0700 (Wed, 01 May 2013) | 2 lines
Changed paths:
M /trunk/Makefile.am
Install the new global profiles and add them to the distribution.
------------------------------------------------------------------------
r49123 | gerald | 2013-05-01 15:06:49 -0700 (Wed, 01 May 2013) | 2 lines
Changed paths:
M /trunk/Makefile.nmake
M /trunk/packaging/nsis/uninstall.nsi
M /trunk/packaging/nsis/wireshark.nsi
Install and uninstall our global profiles.
------------------------------------------------------------------------
r49124 | gerald | 2013-05-01 15:13:51 -0700 (Wed, 01 May 2013) | 2 lines
Changed paths:
M /trunk/packaging/nsis/uninstall.nsi
Profiles → Global Profiles.
------------------------------------------------------------------------
r49125 | gerald | 2013-05-01 15:14:48 -0700 (Wed, 01 May 2013) | 2 lines
Changed paths:
M /trunk/packaging/nsis/wireshark.nsi
Use "Global" to match the other entries.
------------------------------------------------------------------------
r49126 | gerald | 2013-05-01 15:22:10 -0700 (Wed, 01 May 2013) | 2 lines
Changed paths:
M /trunk/packaging/nsis/uninstall.nsi
M /trunk/packaging/nsis/wireshark.nsi
Change the right title this time.
------------------------------------------------------------------------
r49127 | gerald | 2013-05-01 16:17:30 -0700 (Wed, 01 May 2013) | 2 lines
Changed paths:
M /trunk/packaging/ws-manifest.pl
Add global profiles.
------------------------------------------------------------------------
Directory: /trunk-1.10/epan/dissectors/
Changes Path Action
+70 -70 packet-lisp-data.c Modified
+3 -0 packet-lisp.c Modified
Directory: /trunk-1.10/ui/gtk/
Changes Path Action
+1 -1 filter_dlg.c Modified
Directory: /trunk-1.10/packaging/nsis/
Changes Path Action
+7 -0 uninstall.nsi Modified
+17 -3 wireshark.nsi Modified
Directory: /trunk-1.10/packaging/
Changes Path Action
+2 -0 ws-manifest.pl Modified
Directory: /trunk-1.10/
Changes Path Action
+9 -0 Makefile.am Modified
+5 -0 Makefile.nmake Modified
+0 -24 colorfilters Modified