diff options
author | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:09:31 +0200 |
---|---|---|
committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:09:31 +0200 |
commit | 86966a092b6e8dd27d3851ba0c19d52523d09b58 (patch) | |
tree | 7ee82c4411faed3813d14422ad72c5d9fa5b82db /sapi/apache2handler/php_functions.c | |
parent | ce9bdae33f101ff85c08d32ce5c2c6502a451d62 (diff) | |
parent | a90d05a4304a2ef832afe059dc19c7f14ca86f58 (diff) | |
download | php-git-86966a092b6e8dd27d3851ba0c19d52523d09b58.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
this test depends on the simplexml ext, not just on xml
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions