| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | first shot remove TSRMLS_* things | Anatol Belski | 2014-12-13 | 1 | -22/+22 |
| | | |||||
| * | Merge branch 'PHP-5.6' | Anatol Belski | 2014-10-29 | 1 | -0/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: fix output globals importing export output globals use portable strndup implementation unix sockets aren't available on windows dll export APIs needed by phpdbg fix sapi/phpdbg/config.w32 Don't treat warnings as failures in the junit output | ||||
| | * | unix sockets aren't available on windows | Anatol Belski | 2014-10-29 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'PHP-5.6' | Remi Collet | 2014-10-29 | 1 | -1/+0 |
| |\ \ | |/ | | | | | | | * PHP-5.6: cleanup uneeded json | ||||
| | * | cleanup uneeded json | Remi Collet | 2014-10-29 | 1 | -1/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/PHP-5.6' | Bob Weinand | 2014-10-28 | 1 | -2/+0 |
| |\ \ | |/ | |||||
| | * | Merge phpdbg into PHP-5.6 | Bob Weinand | 2014-10-28 | 1 | -2/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/PHP-5.6' | Bob Weinand | 2014-10-28 | 1 | -6/+7 |
| |\ \ | |/ | | | | | | | | | Conflicts: sapi/phpdbg/phpdbg_wait.c sapi/phpdbg/phpdbg_webdata_transfer.c | ||||
| | * | Merge phpdbg into PHP-5.6 | Bob Weinand | 2014-10-28 | 1 | -0/+2 |
| | | | |||||
| | * | Merge ../phpdbg into PHP-5.6 | Bob Weinand | 2014-10-28 | 1 | -7/+8 |
| | | | | | | | | | | | Conflicts: sapi/phpdbg/config.m4 | ||||
| * | | Made phpdbg compatible with new engine | Bob Weinand | 2014-10-24 | 1 | -104/+85 |
| |/ | |||||
| * | Merge phpdbg into PHP-5.6 | Bob Weinand | 2014-10-24 | 1 | -0/+419 |
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |