diff options
author | Remi Collet <remi@php.net> | 2013-06-20 08:42:30 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2013-06-20 08:42:30 +0200 |
commit | 60afd3fce4071ba79fbabfb828b12ad1421bd2d0 (patch) | |
tree | f965b5d3430a73c3151402fc87d57ea274c2214c /sapi/cli/php_cli_server.c | |
parent | 83fc53acb9e8056ec3a6d9f97cf0c911944dcfe7 (diff) | |
parent | 9be591bdb503740ef5d3261422a180e68b9eb3fc (diff) | |
download | php-git-60afd3fce4071ba79fbabfb828b12ad1421bd2d0.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
skip test for bug #64936 when tokenizer not built
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions