diff options
author | Stanislav Malyshev <stas@php.net> | 2013-08-10 17:31:48 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2013-08-10 17:31:48 -0700 |
commit | 143ec706388d3d3dcbfe73e4d14f57c97daa134d (patch) | |
tree | ee613b925ad70c649a8f9ae1377a56f049d88bce /sapi/cli/php_cli_server.c | |
parent | ac538e5e166253a933b1f9f4badae5e19efbf26c (diff) | |
parent | 503d39d9252b4134f2387ac7914f60083aa1c990 (diff) | |
download | php-git-143ec706388d3d3dcbfe73e4d14f57c97daa134d.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
php.ini-development/production: remove php_zip.dll
Update NEWS
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions