summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_help.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-05-26 08:51:32 +0200
committerAnatol Belski <ab@php.net>2014-05-26 08:51:32 +0200
commit567f5e5247e1606f0c5b30f523a122d292a454bb (patch)
tree42e683f6b163e362ba2800575c8010a2bb8e107a /sapi/phpdbg/phpdbg_help.c
parenta4a5e34ed9d79637d4e065a21dec7876617334f1 (diff)
parent347b430a03a394f31048ad16b2bbc22e29f3baf5 (diff)
downloadphp-git-567f5e5247e1606f0c5b30f523a122d292a454bb.tar.gz
Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master: Added tests for ZipArchive::addGlob() and ZipArchive::addPattern() gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir fix test
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions