]> granicus.if.org Git - php/commit
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)
commitba79c45174aa70597e52ff85744927c4d1108e83
tree8a168f708468e38a2dcdab9f1187f9f99fff4125
parent7d0493219c1690aba8291375b6f8a6e620d809fc
parent1fdca8208f057ba48fc7efdae0056f7978120688
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)

Conflicts:
win32/build/confutils.js
ext/gd/gd.c