diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-23 17:12:52 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-23 17:12:52 -0800 |
| commit | 34c1ba5685e5f86f98f0e1b38c95c7dacc106e3b (patch) | |
| tree | f082be380cc0fcc9e71d5e5c8cfc351c55cbd962 /sapi/phpdbg/phpdbg_prompt.h | |
| parent | de075d172c1fe218e1a7a5c2dbd5fa84f9af0e1d (diff) | |
| parent | 5351ecbfca18a86b44e5cadef67a2d6fc153a907 (diff) | |
| download | php-git-34c1ba5685e5f86f98f0e1b38c95c7dacc106e3b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Correct two zlib tests to use a string, not a const
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.h')
0 files changed, 0 insertions, 0 deletions