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

	Commit message (Collapse)	Author	Age	Files	Lines
*	various fixes for removing explicit tsrm_ls usage	Anatol Belski	2014-12-16	1	-4/+0
\|
*	first shot remove TSRMLS_* things	Anatol Belski	2014-12-13	1	-58/+58
\|
*	Merge remote-tracking branch 'origin/PHP-5.6'	Bob Weinand	2014-10-28	1	-0/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.in main/php_version.h sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_bp.c sapi/phpdbg/phpdbg_prompt.c
\| *	Fix possibly unclosed <stream> tags	Bob Weinand	2014-10-28	1	-0/+16
\| \|
* \|	Merge remote-tracking branch 'origin/PHP-5.6'	Bob Weinand	2014-10-27	1	-0/+2
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Stabilize execution, always run destructors and extended file breakpoints	Bob Weinand	2014-10-27	1	-0/+2
\| \|
* \|	Made phpdbg compatible with new engine	Bob Weinand	2014-10-24	1	-8/+9
\|/
*	Merge phpdbg into PHP-5.6	Bob Weinand	2014-10-24	1	-0/+1305