]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d04932 1fdca82)
Merge branch 'PHP-5.5' into PHP-5.6
authorPierre Joye <pierre.php@gmail.com>
Sun, 9 Mar 2014 20:17:06 +0000 (21:17 +0100)
committerPierre Joye <pierre.php@gmail.com>
Sun, 9 Mar 2014 20:17:06 +0000 (21:17 +0100)
* PHP-5.5:
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)

Conflicts:
win32/build/confutils.js

1  2 
ext/gd/gd.c patch | diff1 | diff2 | blob | history

diff --cc ext/gd/gd.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.