]> granicus.if.org Git - php/commit
Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src
authorXinchen Hui <laruence@php.net>
Sat, 21 Mar 2015 06:01:11 +0000 (14:01 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 21 Mar 2015 06:01:11 +0000 (14:01 +0800)
commitc524dd6d1efd31124803bb316c04970c35ad5b7b
tree724a343d70c1c27af3232219f331209f3d8eeac4
parent775a257cef53a0e22390c49e038b412c687c475c
parent25566c67fef76e01a25816b95e68a73a7cc2b64e
Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src

Conflicts:
Zend/zend_vm_gen.php
ext/pcre/php_pcre.c
ext/pcre/php_pcre.c