]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ee7e12 a3fa25e)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 18 Aug 2013 21:16:24 +0000 (14:16 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 18 Aug 2013 21:16:24 +0000 (14:16 -0700)
* PHP-5.4:
  Use pkg-config to detect iodbc

1  2 
ext/odbc/config.m4 patch | diff1 | diff2 | blob | history

diff --cc ext/odbc/config.m4
Simple merge
Unnamed repository; edit this file 'description' to name the repository.