]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3994a70 07220f6)
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Mon, 16 May 2016 03:25:16 +0000 (11:25 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 16 May 2016 03:25:16 +0000 (11:25 +0800)
* PHP-7.0:
  Revert the ABI break commit
  Revert "fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)"


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.