Dmitry Stogov cd4b4dfc4d Merge branch 'master' into refactoring2 ... Conflicts: Zend/zend_hash.c ext/date/php_date.c		2014-05-05 13:02:43 +04:00
..
aolserver	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
apache	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
apache2filter	Merge mainstream 'master' branch into refactoring	2014-04-26 00:32:51 +04:00
apache2handler	Merge mainstream 'master' branch into refactoring	2014-04-26 00:32:51 +04:00
apache_hooks	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
caudium	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
cgi	Fix php-cgi -m	2014-05-01 00:25:23 +02:00
cli	Split IS_BOOL into IS_FALSE and IS_TRUE	2014-04-30 18:32:42 +04: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 'master' into refactoring2	2014-05-05 13:02:43 +04:00
isapi	Bump year	2014-01-03 11:08:10 +08:00
litespeed	Merge mainstream 'master' branch into refactoring	2014-04-26 00:32:51 +04:00
milter	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
nsapi	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
phpdbg	Merge sapi/phpdbg into PHP-5.6	2014-05-03 11:40:25 +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