Anatol Belski
|
bdeb220f48
|
first shot remove TSRMLS_* things
|
2014-12-13 23:06:14 +01:00 |
|
Bob Weinand
|
ec53351447
|
Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
configure.in
main/php_version.h
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_prompt.c
|
2014-10-28 17:40:27 +01:00 |
|
Bob Weinand
|
cc3587f4a3
|
Fix possibly unclosed <stream> tags
|
2014-10-28 17:25:45 +01:00 |
|
Bob Weinand
|
09da8952d0
|
Merge remote-tracking branch 'origin/PHP-5.6'
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
|
2014-10-27 00:34:56 +01:00 |
|
Bob Weinand
|
3ab7734b88
|
Stabilize execution, always run destructors and extended file breakpoints
|
2014-10-27 00:00:16 +01:00 |
|
Bob Weinand
|
2bcac53bca
|
Made phpdbg compatible with new engine
|
2014-10-24 19:29:50 +02:00 |
|
Bob Weinand
|
9b4d9ac6c7
|
Merge phpdbg into PHP-5.6
|
2014-10-24 19:22:45 +02:00 |
|