]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0 php-7.0.5RC1
authorRemi Collet <remi@php.net>
Wed, 16 Mar 2016 06:18:09 +0000 (07:18 +0100)
committerAnatol Belski <ab@php.net>
Wed, 16 Mar 2016 07:11:50 +0000 (08:11 +0100)
commitffe82dd775c2fc4b76e2339f893d2fd1d27bf916
treefbd3381eb3a40bb407ff569927c5c94ca51bff45
parent89919b5ec502594f7b085f8f45bb839223b6baa6
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix #ifdef usage
ext/pdo_dblib/dblib_stmt.c