com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/odbc/config.m4
| From: | Stanislav Malyshev | Date: | Sun, 18 Aug 2013 21:16:24 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/odbc/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72973@lists.php.net to get a copy of this message | ||
Commit: 1794291ebe02d7a1c5387c1d404a9022925f5b47
Author: Stanislav Malyshev <stas@php.net> Sun, 18 Aug 2013 14:16:24 -0700
Parents: 2ee7e122a7aa03aaadb38ebccb9b5c2b07b2a1b3 a3fa25e857ca5d714e72b25c7f6a2999d1df8a6b
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1794291ebe02d7a1c5387c1d404a9022925f5b47
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Use pkg-config to detect iodbc
Changed paths:
MM ext/odbc/config.m4
Diff: