diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-08-13 20:20:10 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-08-13 20:20:10 +0800 |
| commit | 4647016abe27d4a6e7b9c6c990f7ae0e63061dc4 (patch) | |
| tree | f2c713249c7ec921deddb0831312addfac672b23 /ext/mysql/php_mysql_structs.h | |
| parent | 844e2e81f56fca1f49c73df4e15866cd1ba37f30 (diff) | |
| parent | b0f7cc8756b21f3b90bb6d7e52cf7d94d4a4616e (diff) | |
| download | php-git-4647016abe27d4a6e7b9c6c990f7ae0e63061dc4.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS for #66091
Fixed #66091
Conflicts:
ext/date/php_date.c
Diffstat (limited to 'ext/mysql/php_mysql_structs.h')
0 files changed, 0 insertions, 0 deletions