From: Anatol Belski Date: Fri, 25 Apr 2014 22:15:32 +0000 (+0200) Subject: Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 X-Git-Tag: PRE_PHPNG_MERGE~339^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a10dc3aa4f1571bde0db7edf8a6e4780026ea63a;p=php 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 --- a10dc3aa4f1571bde0db7edf8a6e4780026ea63a