diff options
| author | Adam Harvey <aharvey@php.net> | 2014-05-22 22:37:47 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-05-22 22:37:47 +0000 |
| commit | e5e6ba093fd55e75554e549ed40ebbc75a8cf063 (patch) | |
| tree | 56432f74715bc605574a52bd5329437215736637 /sapi/phpdbg/phpdbg_utils.h | |
| parent | d39377924ce0e8cce76a1192ecfb89a48c291e21 (diff) | |
| parent | 5d1bfd6fbfbb1474b23b0b58ef81f8396b361fca (diff) | |
| download | php-git-e5e6ba093fd55e75554e549ed40ebbc75a8cf063.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix run-tests.php with Valgrind >= 3.10.0.
Conflicts:
run-tests.php
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.h')
0 files changed, 0 insertions, 0 deletions