]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sun, 4 May 2014 22:51:40 +0000 (00:51 +0200)
committerAnatol Belski <ab@php.net>
Sun, 4 May 2014 22:51:40 +0000 (00:51 +0200)
* PHP-5.6:
  fixed ZEND_DEBUG usage

1  2 
Zend/zend.c

diff --cc Zend/zend.c
Simple merge