]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 25 Apr 2014 22:17:09 +0000 (00:17 +0200)
committerAnatol Belski <ab@php.net>
Fri, 25 Apr 2014 22:17:09 +0000 (00:17 +0200)
* PHP-5.6:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting


Trivial merge