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