]> granicus.if.org Git - php/commit
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 25 Apr 2014 22:15:32 +0000 (00:15 +0200)
committerAnatol Belski <ab@php.net>
Fri, 25 Apr 2014 22:15:32 +0000 (00:15 +0200)
commita10dc3aa4f1571bde0db7edf8a6e4780026ea63a
treeddcba23546bb5cea8926d5c57599dbbb5e3b2ee3
parent70fdb21d9354f34050c30842a313eddae766a580
parentc8617d82cc9333e87e264a77bcaa53f9754a034e
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

* phpdbg/master:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting
sapi/phpdbg/config.w32
sapi/phpdbg/phpdbg_watch.c