diff options
| author | Johannes Schlüter <johannes@php.net> | 2013-01-31 00:58:52 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2013-01-31 00:58:52 +0100 |
| commit | 9d6636364dd002734b67efe2b2c08b954b650a99 (patch) | |
| tree | 8100276b4f712559738e1cd1ff589c629b793475 /sapi/cli/php_cli_server.c | |
| parent | 836a2b1131dd007edad24d921dbdf42a8ac10e32 (diff) | |
| parent | a80fdc47b3b5046188aee6a9ef310879322cf4e9 (diff) | |
| download | php-git-9d6636364dd002734b67efe2b2c08b954b650a99.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions