Bob Weinand 1e85b9e86b Merge branch 'PHP-5.6' ...

Conflicts:
	sapi/phpdbg/phpdbg.c

2014-06-04 02:20:35 +02:00

..

aolserver

Bump year

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

apache

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

apache2filter

Merge branch 'PHP-5.6'

2014-03-24 17:53:08 +01:00

apache2handler

Merge branch 'PHP-5.6'

2014-04-13 15:40:21 -07:00

apache_hooks

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

caudium

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

cgi

Merge branch 'PHP-5.6'

2014-04-11 19:35:11 +02:00

cli

Merge branch 'PHP-5.6'

2014-04-16 09:50:24 +02:00

continuity

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

embed

Merge branch 'PHP-5.6'

2014-03-24 10:32:07 +01:00

fpm

Merge branch 'PHP-5.6'

2014-04-29 09:17:10 -07:00

isapi

Bump year

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

litespeed

Merge branch 'PHP-5.6'

2014-04-22 10:49:18 -03:00

milter

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

nsapi

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

phpdbg

Merge sapi/phpdbg into PHP-5.6

2014-06-04 02:18:39 +02:00

phttpd

Bump year

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

pi3web

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

roxen

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

tests

- Rewrite scanner to be based on re2c instead of flex

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

thttpd

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

tux

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

webjames

Bump year

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