com php-src: Merge branch 'PHP-5.4' into PHP-5.5: run-tests.php
| From: | Adam Harvey | Date: | Thu, 22 May 2014 22:37:47 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78499@lists.php.net to get a copy of this message | ||
Commit: e5e6ba093fd55e75554e549ed40ebbc75a8cf063
Author: Adam Harvey <aharvey@php.net> Thu, 22 May 2014 22:37:47 +0000
Parents: d39377924ce0e8cce76a1192ecfb89a48c291e21 5d1bfd6fbfbb1474b23b0b58ef81f8396b361fca
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e5e6ba093fd55e75554e549ed40ebbc75a8cf063
Log:
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
Changed paths:
MM run-tests.php
Diff: