]> granicus.if.org Git - apache/commit
resolve merge conflicts for PCRE 3.9
authorBrian Pane <brianp@apache.org>
Wed, 20 Mar 2002 06:17:33 +0000 (06:17 +0000)
committerBrian Pane <brianp@apache.org>
Wed, 20 Mar 2002 06:17:33 +0000 (06:17 +0000)
commit455466e02622df0117b9fa5e3f1150849ad400a6
tree32cbdd4c353e9f92aeea06ec07e7b9e39f0ff96f
parentbf39f937ab5caf1e2174800c66593418355ba3f1
resolve merge conflicts for PCRE 3.9

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94042 13f79535-47bb-0310-9956-ffa450edef68
12 files changed:
srclib/pcre/LICENCE
srclib/pcre/doc/pcre.3
srclib/pcre/doc/pcre.html
srclib/pcre/doc/pcre.txt
srclib/pcre/doc/pcretest.txt
srclib/pcre/pcre.c
srclib/pcre/pcretest.c
srclib/pcre/testdata/testinput3
srclib/pcre/testdata/testoutput1
srclib/pcre/testdata/testoutput2
srclib/pcre/testdata/testoutput3
srclib/pcre/testdata/testoutput4