Ferenc Kovacs cfa1028d7e Merge branch 'PHP-5.5' into PHP-5.6 ... * PHP-5.5: NEWS Fixed Bug #65171 imagescale() fails Revert "Bug #41631: Observe socket read timeouts in SSL streams" Conflicts: ext/openssl/xp_ssl.c		2014-10-15 19:42:51 +02:00
..
libgd	Merge branch 'PHP-5.5' into PHP-5.6	2014-08-19 13:22:14 -07:00
tests	Merge branch 'PHP-5.5' into PHP-5.6	2014-09-16 10:22:49 +02:00
config.m4	Merge branch 'PHP-5.4' into PHP-5.5	2013-12-07 19:41:23 -08:00
config.w32	fix include search	2014-03-12 19:25:20 +01:00
CREDITS	add Marcus, enough work done	2003-06-15 20:16:46 +00:00
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	Merge branch 'PHP-5.4' into PHP-5.5	2014-08-19 01:34:09 -07:00
gd.c	Merge branch 'PHP-5.5' into PHP-5.6	2014-10-15 19:42:51 +02: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	Last bit of CS fixes.	2003-12-28 21:08:46 +00:00
php_gd.h	Bump year	2014-01-03 11:08:10 +08:00