Bob Weinand 6eab2b9101 Merge phpdbg into PHP-5.6 ...

Conflicts:
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_prompt.c

2014-10-27 13:11:13 +01:00

..

aolserver

Bump year

2014-01-03 11:08:10 +08:00

apache

Bump year

2014-01-03 11:08:10 +08:00

apache2filter

fix some warnings

2014-03-24 17:51:50 +01:00

apache2handler

Merge branch 'PHP-5.5' into PHP-5.6

2014-04-13 15:39:32 -07:00

apache_hooks

Bump year

2014-01-03 11:08:10 +08:00

caudium

Bump year

2014-01-03 11:08:10 +08:00

cgi

Merge branch 'PHP-5.5' into PHP-5.6

2014-09-12 14:36:54 +02:00

cli

Merge branch 'PHP-5.5' into PHP-5.6

2014-09-27 02:18:29 +02:00

continuity

Bump year

2014-01-03 11:08:10 +08:00

embed

Merge branch 'PHP-5.4' into PHP-5.5

2014-03-24 10:28:48 +01:00

fpm

Merge branch 'PHP-5.5' into PHP-5.6

2014-10-03 11:39:09 +02:00

isapi

Bump year

2014-01-03 11:08:10 +08:00

litespeed

Fixed a bug that causes crash when environment variable is access while parsing php.ini

2014-10-03 16:42:27 -04:00

milter

Merge branch 'PHP-5.4' into PHP-5.5

2014-07-30 20:12:50 +02:00

nsapi

Bump year

2014-01-03 11:08:10 +08:00

phpdbg

Merge phpdbg into PHP-5.6

2014-10-27 13:11:13 +01:00

phttpd

Bump year

2014-01-03 11:08:10 +08:00

pi3web

Bump year

2014-01-03 11:08:10 +08:00

roxen

Bump year

2014-01-03 11:08:10 +08:00

tests

- Rewrite scanner to be based on re2c instead of flex

2008-03-16 21:06:55 +00:00

thttpd

Bump year

2014-01-03 11:08:10 +08:00

tux

Bump year

2014-01-03 11:08:10 +08:00

webjames

Bump year

2014-01-03 11:08:10 +08:00