diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-06-30 12:30:49 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-06-30 12:30:49 +0200 |
| commit | 3ec93ee19f174f27285872515d236028f0e079f9 (patch) | |
| tree | e2c516d2588df9364f80df6e2ee92e5ef36ed578 /ext/mysqlnd/mysqlnd_charset.c | |
| parent | 6d8d5e9310831c8ebf001dd8d67fc1a6341bde88 (diff) | |
| parent | 803cfe32e657c3c3f3776f1470fd598f5e6a107a (diff) | |
| download | php-git-3ec93ee19f174f27285872515d236028f0e079f9.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
--enable-fpm for the travis build
Diffstat (limited to 'ext/mysqlnd/mysqlnd_charset.c')
0 files changed, 0 insertions, 0 deletions