diff options
| author | Reeze Xia <reeze@php.net> | 2015-03-03 16:29:41 +0800 |
|---|---|---|
| committer | Reeze Xia <reeze@php.net> | 2015-03-03 16:29:41 +0800 |
| commit | bb2e62ecda3f3935a076063be66b394ac6831c09 (patch) | |
| tree | a81867ce00e825981639bfdbf6cc0d9d77d0eb67 /ext/mysql/php_mysql.h | |
| parent | 143cc672827cd37d5bfa8e8626e9e0393e5dc061 (diff) | |
| parent | 808e562f23fcc758c5ffc9b5e2f88429af3add7f (diff) | |
| download | php-git-bb2e62ecda3f3935a076063be66b394ac6831c09.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Improve fix for bug 67741
Conflicts:
main/main.c
Diffstat (limited to 'ext/mysql/php_mysql.h')
0 files changed, 0 insertions, 0 deletions