php-src/sapi
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
..
apache2handler Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
cgi Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
cli Merge branch 'PHP-5.6' into PHP-7.0 2016-01-04 18:13:38 +01:00
embed Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
fpm Merge branch 'PHP-5.6' into PHP-7.0 2016-01-04 18:13:38 +01:00
litespeed Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
phpdbg Happy new year (Update copyright to 2016) 2016-01-01 20:03:16 +02:00
tests Merge branch 'PHP-5.6' 2015-08-11 01:42:25 +02:00