diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-07-28 15:24:41 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-07-28 15:26:29 +0200 |
| commit | 805dc0ea4790b8e3dda63ae5753de14823a09bde (patch) | |
| tree | d2ae09abd24008c9ae9ddd4f7bebeb1c37409938 /ext/sqlite3/libsqlite/sqlite3ext.h | |
| parent | a621023168ee00104dac20c996df3c9e8ad8edcf (diff) | |
| parent | ee6900c3de68f1b94dfae8e230c7fa755c7fa595 (diff) | |
| download | php-git-805dc0ea4790b8e3dda63ae5753de14823a09bde.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