delta/php-git.git - git.php.net: repository/php-src.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Adapt test for new format	Bob Weinand	2015-04-20	1	-8/+8
\|
*	Fixed phpdbg zend_bailout error when compiling syntax error code	Reeze Xia	2015-02-13	1	-0/+17
\| \| \| \|	@krakjoe if there is something wrong, tell me plz
*	Merge remote-tracking branch 'origin/PHP-5.6'	Bob Weinand	2014-10-27	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_bp.c sapi/phpdbg/phpdbg_list.c sapi/phpdbg/phpdbg_parser.c sapi/phpdbg/phpdbg_parser.h sapi/phpdbg/phpdbg_prompt.c
\| *	Fix last commit, and do not output unnecessary information	Bob Weinand	2014-10-27	1	-1/+0
\| \|
* \|	Made phpdbg compatible with new engine	Bob Weinand	2014-10-24	6	-13/+12
\|\ \ \| \|/
\| *	Merge phpdbg into PHP-5.6	Bob Weinand	2014-10-24	5	-12/+11
\|/
*	Merge sapi/phpdbg into PHP-5.6	Bob Weinand	2014-06-15	1	-10/+12
\|
*	Merge sapi/phpdbg into PHP-5.6	Bob Weinand	2014-06-04	4	-16/+25
\|
*	Merge branch 'master' of sapi/phpdbg into PHP-5.6	Bob Weinand	2013-12-20	9	-0/+741
	Including phpdbg.