diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-22 22:04:41 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-22 22:04:41 -0700 |
| commit | a1bca171d23d504fcc57979472574117222aad95 (patch) | |
| tree | dfbced539add4917f15d058f197156cf1a7f9aa9 /ext/xml/php_xml.h | |
| parent | 57f835e1484034d8198b1373c3263ad2dba1b7a8 (diff) | |
| parent | 6f5ed34d201c196919f00c8eb3992c9ff7fd3e85 (diff) | |
| download | php-git-a1bca171d23d504fcc57979472574117222aad95.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* 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
Diffstat (limited to 'ext/xml/php_xml.h')
0 files changed, 0 insertions, 0 deletions