summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_cmd.c
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-02-18 19:48:50 +0100
committerFerenc Kovacs <tyrael@php.net>2015-02-18 19:48:50 +0100
commit24be46323b288ecb5c588fcef86bc9a8ffa05024 (patch)
tree9285ff9792979067cb9d130547bc1768abdb166e /sapi/phpdbg/phpdbg_cmd.c
parent08b6fe9ef135798aa16a894e5773f8cd76ab1fec (diff)
parentc17a17e44b47662cb304bb5497fb7c8b86381548 (diff)
downloadphp-git-24be46323b288ecb5c588fcef86bc9a8ffa05024.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fix typo in bug# add CVE 5.4.39 next Conflicts: configure.in main/php_version.h
Diffstat (limited to 'sapi/phpdbg/phpdbg_cmd.c')
0 files changed, 0 insertions, 0 deletions