diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-15 17:17:39 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-15 17:17:39 -0700 |
| commit | ea8370c29ac6940ce4acfe48688dfa2d9745cebd (patch) | |
| tree | afda7b2870aa7e8553e8156bd2a2d33ed091f5a5 /sapi/cli/php_cli_server.c | |
| parent | aaf197180a47d3fe9dfc8a25acdf89c0a7bca059 (diff) | |
| parent | 6bf7c10b208b88848a8eeed17caa3e2ae4f09f77 (diff) | |
| download | php-git-ea8370c29ac6940ce4acfe48688dfa2d9745cebd.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.4.29 is next
5.5.12RC1 setup
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions