php-src/sapi
Bob Weinand 044f37a832 Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_list.c
2014-10-25 19:09:19 +02:00
..
aolserver removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
apache removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
apache2filter Move smart_str implementation into Zend/ 2014-09-21 20:49:39 +02:00
apache2handler removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
apache_hooks removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
caudium Removes accidentally added files. 2014-09-20 18:27:09 +02:00
cgi fix signed/unsigned mismatch 2014-10-13 18:43:10 +02:00
cli fix several datatype mismatch warnings 2014-10-13 18:43:14 +02:00
continuity s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
embed removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
fpm Merge branch 'PHP-5.6' 2014-10-03 11:40:05 +02:00
isapi removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
litespeed Merge branch 'master' of git.php.net:php-src 2014-10-03 16:43:58 -04:00
milter s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
nsapi removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
phpdbg Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-25 19:09:19 +02:00
phttpd s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
pi3web removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
roxen Merge branch 'master' into issue-67910 2014-09-20 10:09:21 +02:00
tests - Rewrite scanner to be based on re2c instead of flex 2008-03-16 21:06:55 +00:00
thttpd Move smart_str implementation into Zend/ 2014-09-21 20:49:39 +02:00
tux Move smart_str implementation into Zend/ 2014-09-21 20:49:39 +02:00
webjames Merge branch 'master' into issue-67910 2014-09-20 10:09:21 +02:00