]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d393779 5d1bfd6)
Merge branch 'PHP-5.4' into PHP-5.5
authorAdam Harvey <aharvey@php.net>
Thu, 22 May 2014 22:37:47 +0000 (22:37 +0000)
committerAdam Harvey <aharvey@php.net>
Thu, 22 May 2014 22:37:47 +0000 (22:37 +0000)
* PHP-5.4:
  Fix run-tests.php with Valgrind >= 3.10.0.

Conflicts:
run-tests.php

1  2 
run-tests.php patch | diff1 | diff2 | blob | history

diff --cc run-tests.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.