Christoph M. Becker 138fea83fe Merge branch 'PHP-5.6' into PHP-7.0 ...

# Resolved conflicts:
#	ext/gd/tests/gd_info_variation1.phpt

2016-07-25 02:02:54 +02:00

..

libgd

Merge branch 'PHP-5.6' into PHP-7.0

2016-07-23 19:36:53 +02:00

tests

Merge branch 'PHP-5.6' into PHP-7.0

2016-07-25 02:02:54 +02:00

config.m4

libwebp support for linux

2015-07-21 10:37:07 +02:00

config.w32

fix libwebp namings

2015-07-24 17:06:29 +02:00

CREDITS

…

gd_compat.c

Merge branch 'PHP-5.6' into PHP-7.0

2015-11-20 15:36:26 +08: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.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

gd.c

merge conflict

2016-07-19 18:55:09 +07:00

gdcache.c

trailing whitespace removal

2015-01-10 15:07:38 -08:00

gdcache.h

…

php_gd.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00