]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Wed, 2 Aug 2017 07:35:38 +0000 (08:35 +0100)
committerJoe Watkins <krakjoe@php.net>
Wed, 2 Aug 2017 07:35:38 +0000 (08:35 +0100)
commit9c6262f39bbda2a3ca17662ad2704df3ff4374c6
treef2d216db6babd854830e6ab0b14151515f192f82
parentf0d40286e760c0fe73435d553a737050b338c02f
parentb2934d2612a1d1d422010ff47c4a9d2a00ed83ee
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fixed #endif comments
Zend/zend.c