]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 19 Mar 2013 13:44:20 +0000 (14:44 +0100)
committerAnatol Belski <ab@php.net>
Tue, 19 Mar 2013 13:44:20 +0000 (14:44 +0100)
* PHP-5.4:
  fix C90 compat

1  2 
Zend/zend_API.c

diff --cc Zend/zend_API.c
Simple merge