diff options
author | Stanislav Malyshev <stas@php.net> | 2014-08-14 17:05:03 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-08-14 17:05:03 -0700 |
commit | 008330e5b30add0c1ef36408c25ca0f7ad9631f0 (patch) | |
tree | de0a3f1c2c2e63c83764fadd66e3a35bd383f1a2 /sapi/cli/php_cli.c | |
parent | 418563320788cb70c9319c3625669fea53afa295 (diff) | |
parent | b7cd099ae04c926f8faedbf8c726984d9315ccb9 (diff) | |
download | php-git-008330e5b30add0c1ef36408c25ca0f7ad9631f0.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
split the glob() test to test different basedir
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions