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