]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 775a257 25566c6)
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)
Conflicts:
Zend/zend_vm_gen.php
ext/pcre/php_pcre.c

1  2 
ext/pcre/php_pcre.c patch | diff1 | diff2 | blob | history

diff --cc ext/pcre/php_pcre.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.