]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ea2b36 f061867)
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Tue, 19 Apr 2016 06:34:26 +0000 (23:34 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 19 Apr 2016 06:34:26 +0000 (23:34 -0700)
* PHP-5.6:
  Fix bug #71952: Corruption inside imageaffinematrixget

Conflicts:
ext/gd/gd.c


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