diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-07-28 13:09:09 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-07-28 13:12:40 +0200 |
| commit | 18a37eeeece3c8ff88a5c9fff0bc3871cbe37c17 (patch) | |
| tree | c87352380cdb604d10fd6fafd7140c4589206555 /ext/sqlite3/libsqlite/sqlite3ext.h | |
| parent | c7a4e37d9771ec212ad58fa344b380cbe6aa92a1 (diff) | |
| parent | d276e6a8386a68d57d5dd07c3d7e15de4b03c6b3 (diff) | |
| download | php-git-18a37eeeece3c8ff88a5c9fff0bc3871cbe37c17.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/mbstring/php_mbregex.c
Diffstat (limited to 'ext/sqlite3/libsqlite/sqlite3ext.h')
0 files changed, 0 insertions, 0 deletions