diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-01-06 23:00:11 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-01-06 23:00:11 +0100 |
| commit | 8c9415e5d762202a560de9fe7a3fd640f2a966a3 (patch) | |
| tree | d33124b3aeff6507f0bc25e0aa2e9b24a6d54c9b /ext/sqlite3/php_sqlite3_structs.h | |
| parent | 1b5e87862ff8b1ca40ea2c7f3edf9755c73e2eff (diff) | |
| parent | b0a26ab8f840ed1b48011caab3411c599f4451c5 (diff) | |
| download | php-git-8c9415e5d762202a560de9fe7a3fd640f2a966a3.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
PHP-5.6.6 is next
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/sqlite3/php_sqlite3_structs.h')
0 files changed, 0 insertions, 0 deletions