]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb98366 1174b39)
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Wed, 25 Mar 2015 09:33:31 +0000 (10:33 +0100)
committerRemi Collet <remi@php.net>
Wed, 25 Mar 2015 09:33:31 +0000 (10:33 +0100)
* PHP-5.5:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared


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