com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/gd/gd.c
| From: | Pierre Joye | Date: | Sun, 09 Mar 2014 20:17:06 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76395@lists.php.net to get a copy of this message | ||
Commit: ba79c45174aa70597e52ff85744927c4d1108e83
Author: Pierre Joye <pierre.php@gmail.com> Sun, 9 Mar 2014 21:17:06 +0100
Parents: 7d0493219c1690aba8291375b6f8a6e620d809fc 1fdca8208f057ba48fc7efdae0056f7978120688
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ba79c45174aa70597e52ff85744927c4d1108e83
Log:
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
Bugs:
https://bugs.php.net/66869
Changed paths:
MM ext/gd/gd.c
Diff: