]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57f835e 6f5ed34)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 05:04:41 +0000 (22:04 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 05:04:41 +0000 (22:04 -0700)
* PHP-5.5:
  Print checking message for all ODBC drivers
  Change default option of ODBC drivers to no to enable bulding standalone ODBC

Conflicts:
ext/odbc/config.m4


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.