Nikita Popov 904a83a137 Merge remote-tracking branch 'php-src/master' into ast ... Conflicts: ext/opcache/Optimizer/optimize_func_calls.c		2014-08-16 22:31:13 +02:00
..
basic	The test output is dependent on expose_php ini	2014-07-11 09:12:32 -07:00
classes	Merge remote-tracking branch 'php-src/phpng' into ast	2014-08-16 21:55:08 +02:00
func	Update stack size in tests/func/010.phpt	2014-02-26 16:40:25 +01:00
lang	Merge remote-tracking branch 'php-src/master' into ast	2014-08-16 22:31:13 +02:00
output	Merge branch 'PHP-5.4' into PHP-5.5	2013-06-13 10:30:18 -07:00
run-test	Fix tests to account for warnings moved from RT to CT	2014-08-15 18:44:39 +02:00
security	fix these tests so they properly clean up after themselves.	2014-01-20 18:04:35 +01:00
strings	Fix tests expecting specific resource IDs	2013-12-15 16:51:21 +08:00
quicktester.inc