Pierre Joye ba79c45174 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

2014-03-09 21:17:06 +01:00

..

libgd

Merge branch 'PHP-5.5' into PHP-5.6

2014-03-05 10:44:04 +01:00

tests

Merge branch 'PHP-5.5' into PHP-5.6

2014-03-05 10:44:04 +01:00

config.m4

Merge branch 'PHP-5.4' into PHP-5.5

2013-12-07 19:41:23 -08:00

config.w32

fixe preprocessor definition

2013-05-15 14:24:21 +02:00

CREDITS

…

gd_compat.c

gd: fix previous (bad include)

2013-05-06 10:07:06 +02:00

gd_compat.h

Revert removal of overflow2 use in gd.c

2013-05-06 10:00:45 +02:00

gd_ctx.c

Bump year

2014-01-03 11:08:10 +08:00

gd.c

Merge branch 'PHP-5.5' into PHP-5.6

2014-03-09 21:17:06 +01:00

gd.dsp

revert change #298288: Remove old dsp/dsw/makefile files

2010-04-28 14:41:51 +00:00

gdcache.c

Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef

2013-05-04 16:50:06 +02:00

gdcache.h

…

php_gd.h

Bump year

2014-01-03 11:08:10 +08:00