diff options
| author | Remi Collet <remi@php.net> | 2015-03-25 10:33:31 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-03-25 10:33:31 +0100 |
| commit | 3924548bcb6be47beeee348ed9b01ab2d64ae3a7 (patch) | |
| tree | 95e766562e20569e0596e61d4fa8cdebea69365f /ext/sqlite3/libsqlite/sqlite3.c | |
| parent | eb983666427f211408feb4faee7f4b5434db935e (diff) | |
| parent | 1174b399ad325b630ba202abc6671d8055160b99 (diff) | |
| download | php-git-3924548bcb6be47beeee348ed9b01ab2d64ae3a7.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
Diffstat (limited to 'ext/sqlite3/libsqlite/sqlite3.c')
0 files changed, 0 insertions, 0 deletions