summaryrefslogtreecommitdiff
path: root/ext/mbstring/php_mbregex.h
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-11-22 00:40:11 -0800
committerStanislav Malyshev <stas@php.net>2014-11-22 00:40:11 -0800
commitbc55af0cf22aa419376b52fbd3f4c7310ab07d77 (patch)
tree35fd97f2e4cace430e05dcde7fcc0466740ce798 /ext/mbstring/php_mbregex.h
parent99fa36cc5852b7e7ee45708175dd22cd357f2fdd (diff)
parent96cde1841adcb2c1f48ad875e1061ce8e4442753 (diff)
downloadphp-git-bc55af0cf22aa419376b52fbd3f4c7310ab07d77.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Revert "made lsapi_main.c compatible with PHP7/phpng ."
Diffstat (limited to 'ext/mbstring/php_mbregex.h')
0 files changed, 0 insertions, 0 deletions