summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli.c
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-09-30 01:35:35 +0200
committerFerenc Kovacs <tyrael@php.net>2015-09-30 01:35:35 +0200
commit70e6bf03bfaa691d9287603181b7bcefb4440d05 (patch)
tree5e9a1e34908fa3b2266944169491b8be012af03e /sapi/cli/php_cli.c
parent6d9f12d0b3a6a2c716663af982c281f2143eef39 (diff)
parent0c10e10ee891354a3e0413bf2542bb8e8f9a47e7 (diff)
downloadphp-git-70e6bf03bfaa691d9287603181b7bcefb4440d05.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: update NEWS, these missed 5.6.14RC1 as I was not asked to include them so delaying for the next release
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions