]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc0425c f0b459b)
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Tue, 25 Dec 2012 09:39:02 +0000 (13:39 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 25 Dec 2012 09:39:02 +0000 (13:39 +0400)
* PHP-5.4:
  Fixed ZTS build

1  2 
Zend/zend_compile.c patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_compile.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.