summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-12-08 15:53:41 -0800
committerStanislav Malyshev <stas@php.net>2013-12-08 15:53:41 -0800
commitcfd5ea43017500379ae302a67347641712e921ac (patch)
tree07308c146951e7a23a4b61d3cff675ac247a5873 /sapi/cli/php_cli_server.c
parent9feb87b017b804dacac9867a85efad896cc6d59d (diff)
parent744f35d2ab9d5ef5ebb0276aa1b3fc0ceb872087 (diff)
downloadphp-git-cfd5ea43017500379ae302a67347641712e921ac.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Replace invalid code with a proper #error
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions