diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-06-20 13:58:26 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-06-20 13:58:26 +0400 |
| commit | f08a5bfadc360cb53574bdb2f4dc32ac30636133 (patch) | |
| tree | baef48faa90b12f5b20f1fb6b63da0584d2d5729 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | e9c9169e05e0f9753151c16e6a0806f9c5c614bb (diff) | |
| parent | f0639611cf65a8a35119e65bad6f472346b14543 (diff) | |
| download | php-git-f08a5bfadc360cb53574bdb2f4dc32ac30636133.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed MarinaDB support
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
0 files changed, 0 insertions, 0 deletions