summaryrefslogtreecommitdiff
path: root/ext/pcre
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-10-10 10:32:38 +0800
committerXinchen Hui <laruence@php.net>2012-10-10 10:32:38 +0800
commit4b152e5470f7369c76568da8014a10fa87e2c471 (patch)
treeff01f1c4215089a06228b3f046f0ea24721e92bb /ext/pcre
parent75a2c0d71555a432db170b37720a4f3b4cd8f224 (diff)
parent45e938ec343ba566a3effd7a2247a00a08f683cd (diff)
downloadphp-git-4b152e5470f7369c76568da8014a10fa87e2c471.tar.gz
Merge branch 'PHP-5.4'
Diffstat (limited to 'ext/pcre')
-rw-r--r--[-rwxr-xr-x]ext/pcre/tests/bug34790.phpt0
-rw-r--r--[-rwxr-xr-x]ext/pcre/tests/preg_filter.phpt0
2 files changed, 0 insertions, 0 deletions
diff --git a/ext/pcre/tests/bug34790.phpt b/ext/pcre/tests/bug34790.phpt
index c375ae5ac8..c375ae5ac8 100755..100644
--- a/ext/pcre/tests/bug34790.phpt
+++ b/ext/pcre/tests/bug34790.phpt
diff --git a/ext/pcre/tests/preg_filter.phpt b/ext/pcre/tests/preg_filter.phpt
index 6cd9802575..6cd9802575 100755..100644
--- a/ext/pcre/tests/preg_filter.phpt
+++ b/ext/pcre/tests/preg_filter.phpt