]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorRemi Collet <remi@php.net>
Wed, 16 Mar 2016 06:18:23 +0000 (07:18 +0100)
committerRemi Collet <remi@php.net>
Wed, 16 Mar 2016 06:18:23 +0000 (07:18 +0100)
* PHP-7.0:
  fix #ifdef usage


Trivial merge