diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-08 23:41:30 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-08 23:41:30 -0700 |
| commit | 0f333fa93c63f70d06b5aa8c65b6bf23057b1b58 (patch) | |
| tree | af45efe997ff7e006a1f63765341a049f47a46f1 /ext/mysqli/php_mysqli_structs.h | |
| parent | 934d6ed900f3d9dbb94e8d428fd60cf2360d80d4 (diff) | |
| parent | fa72f1ea869e23fd92c50f69a8350e50d57e1c12 (diff) | |
| download | php-git-0f333fa93c63f70d06b5aa8c65b6bf23057b1b58.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
added missing parentheses
Fix #67626
Fix #63486
Conflicts:
main/streams/userspace.c
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
0 files changed, 0 insertions, 0 deletions