diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-05 20:13:24 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-05 20:13:24 -0700 |
| commit | 63e7b845933424cbc97daa6b8e727c07a1a7ea73 (patch) | |
| tree | 67b38202bfd9a4303a207582af50d374d575fee3 /ext/mysql/php_mysql.c | |
| parent | cf910f351ab7d8a55aba1aa717056ca2576a629b (diff) | |
| parent | ee1b807219cb642e36b6813b4cbc6af686aba537 (diff) | |
| download | php-git-63e7b845933424cbc97daa6b8e727c07a1a7ea73.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix the test according to how new date code does it
fix to work on different ICU versions
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions