diff options
| author | Remi Collet <remi@php.net> | 2014-01-20 09:39:29 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-01-20 09:39:29 +0100 |
| commit | 0401226d93c2538956437688a692e96466b1cca3 (patch) | |
| tree | 305744717142a83e2c528a8e5f5d9e7e1e1b0272 /ext/mysql/php_mysql.c | |
| parent | 91513097cac920e7731cf0520c22f61574416864 (diff) | |
| parent | e3192473b56c8ed112333053e28eb6d91d7c3b64 (diff) | |
| download | php-git-0401226d93c2538956437688a692e96466b1cca3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions