]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorRemi Collet <remi@php.net>
Wed, 16 Mar 2016 06:18:09 +0000 (07:18 +0100)
committerRemi Collet <remi@php.net>
Wed, 16 Mar 2016 06:18:09 +0000 (07:18 +0100)
commit46293ed6d451f9a8a4653cd0179b3f501bb12b4a
treecc2f761f7a9f4ee33f92297e84f63b18c7026d31
parentba71144b8c252fda301140f378716c528f3986f4
parent478c80712877da23019802178da1fcd6e6b83e1e
Merge branch 'PHP-5.6' into PHP-7.0

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