]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9be93b 4392339)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Thu, 8 May 2014 09:00:23 +0000 (02:00 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 8 May 2014 09:00:23 +0000 (02:00 -0700)
* PHP-5.4:
  oops, 5.4 and 5.5 use malloc in TSRM


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