]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad139d9 cd1cab3)
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Tue, 1 Oct 2013 15:01:44 +0000 (17:01 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Oct 2013 15:01:44 +0000 (17:01 +0200)
* PHP-5.4:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())

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.