]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 23 Dec 2013 11:00:49 +0000 (12:00 +0100)
committerAnatol Belski <ab@php.net>
Mon, 23 Dec 2013 11:00:49 +0000 (12:00 +0100)
* PHP-5.4:
  removed outdated IsDebuggerPresent declaration

1  2 
Zend/zend.c

diff --cc Zend/zend.c
Simple merge