summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-10-02 09:40:42 +0200
committerAnatoliy Belsky <ab@php.net>2012-10-02 09:40:42 +0200
commit45351eaab4d8f065c5948de5f28df975b36d592c (patch)
treec725a8b87a766db7360bc6e94ef15c1158c8ab79 /sapi/cli/php_cli_server.c
parent60a280936e52b3ab20f0ece06e80088a5bd8fd0c (diff)
parent0165eec1ea63d4b4a063d68e7b78947f038d67ba (diff)
downloadphp-git-45351eaab4d8f065c5948de5f28df975b36d592c.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: fixed include checks for libpng under win
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions