]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 666197b 980c636)
Merge branch 'PHP-5.5' into PHP-5.6
authorMatteo Beccati <mbeccati@php.net>
Sat, 24 May 2014 22:08:41 +0000 (00:08 +0200)
committerMatteo Beccati <mbeccati@php.net>
Sat, 24 May 2014 22:08:41 +0000 (00:08 +0200)
* PHP-5.5:
  Fix broken Junit output with --disable-cgi

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.