]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd1c358 5df8cf1)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 14 Mar 2013 13:39:47 +0000 (14:39 +0100)
committerAnatol Belski <ab@php.net>
Thu, 14 Mar 2013 13:39:47 +0000 (14:39 +0100)
* PHP-5.4:
  fix zts check

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.