diff options
author | Stanislav Malyshev <stas@php.net> | 2014-10-14 11:45:01 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-10-14 11:45:01 -0700 |
commit | 01d17228dc62ea30b7ad25835f049ccd1998b5f2 (patch) | |
tree | 2abe6e759d8c1383dd936675248689c685ac6b1a /sapi/cli/php_cli_server.c | |
parent | d9559d0ecd81ea09575cdbb20e908d5516cad4ad (diff) | |
parent | 47a1447cc8b5be0b19843a21d533984803993755 (diff) | |
download | php-git-01d17228dc62ea30b7ad25835f049ccd1998b5f2.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix return code (merges are hard :( )
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions