diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-06-20 14:02:15 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-06-20 14:02:15 +0400 |
| commit | 629c9d3eda6df5f25701b33033ec13982b1f0d04 (patch) | |
| tree | aa0c0baba218ec950877718c1d26085cc80cea37 /ext/mysql/php_mysql.c | |
| parent | 2777662694f86da5a6200b0bfb46043e72b25103 (diff) | |
| parent | 687fa7d63d651dcace32054a6e50131f9edfa07d (diff) | |
| download | php-git-629c9d3eda6df5f25701b33033ec13982b1f0d04.tar.gz | |
Merge branch 'master' into phpng
* master:
Fixed MarinaDB support
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions