http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=31605
User: gerald
Date: 2010/01/21 09:30 AM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r31302 | gerald | 2009-12-17 17:15:08 -0800 (Thu, 17 Dec 2009) | 3 lines
Changed paths:
M /trunk/configure.in
M /trunk/epan/dfilter/semcheck.c
M /trunk/epan/ftypes/ftype-bytes.c
M /trunk/epan/ftypes/ftype-pcre.c
M /trunk/epan/ftypes/ftype-string.c
M /trunk/epan/ftypes/ftype-tvbuff.c
M /trunk/epan/ftypes/ftypes-int.h
M /trunk/epan/ftypes/ftypes.h
M /trunk/gtk/dfilter_expr_dlg.c
M /trunk/version_info.c
If we don't have PCRE and we do have GLib >= 2.14, use GRegexes for the
"matches" operator.
------------------------------------------------------------------------
r31303 | gerald | 2009-12-17 17:25:46 -0800 (Thu, 17 Dec 2009) | 2 lines
Changed paths:
M /trunk/epan/ftypes/ftype-bytes.c
M /trunk/epan/ftypes/ftype-tvbuff.c
Fix our match flags.
------------------------------------------------------------------------
r31304 | gerald | 2009-12-17 17:29:56 -0800 (Thu, 17 Dec 2009) | 3 lines
Changed paths:
M /trunk/config.nmake
Disable PCRE in the Win32 build. GRegex uses a newer version than we do
and this matches the Win64 configuration.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.2/epan/dfilter/
Changes Path Action
+1 -1 semcheck.c Modified
Directory: /trunk-1.2/docbook/
Changes Path Action
+2 -1 release-notes.xml Modified
Directory: /trunk-1.2/epan/ftypes/
Changes Path Action
+31 -1 ftype-bytes.c Modified
+150 -1 ftype-pcre.c Modified
+30 -1 ftype-string.c Modified
+42 -1 ftype-tvbuff.c Modified
+2 -0 ftypes-int.h Modified
+2 -0 ftypes.h Modified
Directory: /trunk-1.2/gtk/
Changes Path Action
+1 -1 dfilter_expr_dlg.c Modified
Directory: /trunk-1.2/
Changes Path Action
+1 -1 config.nmake Modified
+1 -0 configure.in Modified
(1 file not shown)