diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-02-27 02:32:47 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-02-27 02:32:47 +0100 |
| commit | 42a43d45317ac93c2ba934486879a0bc418bc34d (patch) | |
| tree | 646c507f4beeca8804e64cc8cb07dd1398f83954 /ext/mysqli/php_mysqli_structs.h | |
| parent | afb0675e3b5efde717b482ec69e7fb7e601a6ad0 (diff) | |
| parent | fd20278fa58f77879124783d3207a7fd6e059199 (diff) | |
| download | php-git-42a43d45317ac93c2ba934486879a0bc418bc34d.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
0 files changed, 0 insertions, 0 deletions