]> granicus.if.org Git - php/commitdiff
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)
* phpdbg/master:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting

1  2 
sapi/phpdbg/config.w32
sapi/phpdbg/phpdbg_watch.c

Simple merge
Simple merge