diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:18:51 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:18:51 +0200 |
| commit | 50b20e75ffd8623fd75fd7be55029b1c100f918e (patch) | |
| tree | 7dc05ff21d2b7c3af7f1820248227c64aef65eb6 /ext/sqlite3/php_sqlite3_structs.h | |
| parent | 86674b5837bffe4486714f9661620020ee498f3b (diff) | |
| parent | 86966a092b6e8dd27d3851ba0c19d52523d09b58 (diff) | |
| download | php-git-50b20e75ffd8623fd75fd7be55029b1c100f918e.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
this test depends on the simplexml ext, not just on xml
Conflicts:
ext/simplexml/tests/bug62328.phpt
Diffstat (limited to 'ext/sqlite3/php_sqlite3_structs.h')
0 files changed, 0 insertions, 0 deletions