Julien Pauli 736b91c650 Merge branch 'PHP-5.6' into PHP-7.0 ... * PHP-5.6: Happy new year (Update copyright to 2016) Conflicts: ext/json/php_json_encoder.h sapi/continuity/capi.c		2016-01-04 18:13:38 +01:00
..
dev	More check_parameters improvements	2015-10-02 09:05:39 +02:00
man1	Happy new year (Update copyright to 2016)	2016-01-03 01:44:37 +02:00
Makefile.frag	Remove tabs on blanklines in Makefile sources. This prevents a	2013-08-07 13:14:00 -07:00
php-config.in	Drop support for autoconf < 2.60 in trunk and the	2011-05-15 06:09:21 +00:00
phpize.in	Fixbug: phpize --clean will delete include/*.h	2013-08-18 13:52:20 -07:00
phpize.m4	Fix wrong display in ZTS checking	2015-05-12 17:32:01 +08:00