diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-22 16:57:17 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-22 16:57:17 -0700 |
| commit | aca526a13b8fa9b3444906a18c3e20a7d2672d94 (patch) | |
| tree | 202248786d719b7b3eb962e5ec62feffb7eecd48 /sapi/phpdbg/phpdbg_lexer.c | |
| parent | dafb2af705d0e6c4c747ecf4b3f7cf8e25454dd0 (diff) | |
| parent | 61499bf28252f7bea040395721178bb1a41365b9 (diff) | |
| download | php-git-aca526a13b8fa9b3444906a18c3e20a7d2672d94.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix accepting ill-formed UTF-8 characters
Conflicts:
ext/phar/phar_path_check.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_lexer.c')
0 files changed, 0 insertions, 0 deletions