diff options
author | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:09:00 +0200 |
---|---|---|
committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:09:00 +0200 |
commit | a90d05a4304a2ef832afe059dc19c7f14ca86f58 (patch) | |
tree | c51c8488d1f5d763c9aa51aa85132ab7f31c2109 /sapi/apache2handler/php_functions.c | |
parent | c4fb183b9fd6fecf7dfb8df309bfa34ff1ec2e53 (diff) | |
parent | cb41a7bad1350f1c9bd162abf52eea128a395e0a (diff) | |
download | php-git-a90d05a4304a2ef832afe059dc19c7f14ca86f58.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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