]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Sun, 8 Mar 2015 06:36:35 +0000 (07:36 +0100)
committerRemi Collet <remi@php.net>
Sun, 8 Mar 2015 06:36:35 +0000 (07:36 +0100)
* PHP-5.5:
  Fix odbc build as shared

1  2 
ext/odbc/config.m4

Simple merge