com php-src: Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src: ext/pcre/php_pcre.c
| From: | Xinchen Hui | Date: | Sat, 21 Mar 2015 06:01:11 +0000 |
| Subject: | com php-src: Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src: ext/pcre/php_pcre.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85740@lists.php.net to get a copy of this message | ||
Commit: c524dd6d1efd31124803bb316c04970c35ad5b7b
Author: Xinchen Hui <laruence@php.net> Sat, 21 Mar 2015 14:01:11 +0800
Parents: 775a257cef53a0e22390c49e038b412c687c475c 25566c67fef76e01a25816b95e68a73a7cc2b64e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c524dd6d1efd31124803bb316c04970c35ad5b7b
Log:
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
Changed paths:
MM ext/pcre/php_pcre.c
Diff: