Ferenc Kovacs c03b6e1701 Merge branch 'PHP-5.6' ...

* PHP-5.6:
  NEWS
  Fixed Bug #65171 imagescale() fails
  Revert "Bug #41631: Observe socket read timeouts in SSL streams"

2014-10-15 19:43:30 +02:00

..

libgd

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02: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

…

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

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

gd.c

Merge branch 'PHP-5.6'

2014-10-15 19:43:30 +02: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

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00