summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-08-14 17:22:06 -0700
committerStanislav Malyshev <stas@php.net>2014-08-14 17:22:06 -0700
commit23122ba69ce628769bd61f7f0aaecdba203fee26 (patch)
tree6dfb6a87bbceada0b7c8e4617f048379fdb5b853 /sapi/cli/php_cli.c
parented7ab762de586de1dec3d98297b6a464b6dac686 (diff)
parent59c2477bc331370105e917db27e82d4e483ab7f0 (diff)
downloadphp-git-23122ba69ce628769bd61f7f0aaecdba203fee26.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fix bug #67716 - Segfault in cdf.c Fix bug #67716 - Segfault in cdf.c
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions