]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
authorJoe Watkins <krakjoe@php.net>
Mon, 10 Apr 2017 07:07:24 +0000 (08:07 +0100)
committerJoe Watkins <krakjoe@php.net>
Mon, 10 Apr 2017 07:07:24 +0000 (08:07 +0100)
* 'PHP-7.0' of git.php.net:/php-src:
  Fixed condition check
  Fixed issue #2466 Invalid integer constant expression error in php.h


Trivial merge