]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bf0c12 34c1ba5)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 01:13:12 +0000 (17:13 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 01:13:12 +0000 (17:13 -0800)
* PHP-5.6:
  Correct two zlib tests to use a string, not a const


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.