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

1  2 
Zend/zend.c

diff --cc Zend/zend.c
Simple merge