diff options
| author | Andrey Hristov <andrey@php.net> | 2014-08-06 16:25:12 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-08-06 16:25:12 +0300 |
| commit | 3dc9bef81916fd203244b8c5fc73d282d333bf9a (patch) | |
| tree | bd8b70a5810c74f4a2f3b5adacb7f85e731a5953 /ext/mysql/php_mysql.c | |
| parent | f5deb18b205f89cb6708f97f451b43ad5ece4197 (diff) | |
| parent | ce5efa7adc4637957e70a6f6641a38f484baee99 (diff) | |
| download | php-git-3dc9bef81916fd203244b8c5fc73d282d333bf9a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions