git.ipfire.org Git - thirdparty/apache/httpd.git/commit

]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit

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		diff \| blob \| blame \| history
srclib/pcre/doc/pcre.3		diff \| blob \| blame \| history
srclib/pcre/doc/pcre.html		diff \| blob \| blame \| history
srclib/pcre/doc/pcre.txt		diff \| blob \| blame \| history
srclib/pcre/doc/pcretest.txt		diff \| blob \| blame \| history
srclib/pcre/pcre.c		diff \| blob \| blame \| history
srclib/pcre/pcretest.c		diff \| blob \| blame \| history
srclib/pcre/testdata/testinput3		diff \| blob \| blame \| history
srclib/pcre/testdata/testoutput1		diff \| blob \| blame \| history
srclib/pcre/testdata/testoutput2		diff \| blob \| blame \| history
srclib/pcre/testdata/testoutput3		diff \| blob \| blame \| history
srclib/pcre/testdata/testoutput4		diff \| blob \| blame \| history

Mirror of https://github.com/apache/httpd.git