diff options
| author | Anatol Belski <ab@php.net> | 2014-12-05 15:50:18 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-05 15:50:18 +0100 |
| commit | 297f582f5cdbb40378f476bd3db19280aa4aa519 (patch) | |
| tree | 954cbdccd6cff9c1bd36b43400ca2e6a414e18a5 /ext/pdo_mysql/pdo_mysql.c | |
| parent | 0e09e5e6fa55593936c473ebfa705e7455d3fafe (diff) | |
| parent | fccd1eda5fe440105d051f4cbaa77ced95b674f0 (diff) | |
| download | php-git-297f582f5cdbb40378f476bd3db19280aa4aa519.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
. Fixed bug #68120 Update bundled libsqlite
Conflicts:
ext/sqlite3/libsqlite/sqlite3.c
Diffstat (limited to 'ext/pdo_mysql/pdo_mysql.c')
0 files changed, 0 insertions, 0 deletions