diff options
| author | Anatol Belski <ab@php.net> | 2014-11-20 13:36:37 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-20 13:36:37 +0100 |
| commit | e25b23d1c9f4d0eef08268516a31efa5e0a8aa31 (patch) | |
| tree | d8a66b93b100873e738220af7bd4be2baf81c765 /ext/pdo_mysql/php_pdo_mysql_int.h | |
| parent | 9fd54bd9d8f20f4d56c3d8e0209c6c34fb3bfc98 (diff) | |
| parent | 6c3768b15410ca2b70a4c2ba31d2a7f0d7c53ad3 (diff) | |
| download | php-git-e25b23d1c9f4d0eef08268516a31efa5e0a8aa31.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
split formatter_format*.phpt for ICP 54.1
split dateformat_timezone_arg_variations*.phpt for ICU 54.1
split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
fix icu version to test
split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
clone dateformat_calendars_variant3.phpt for ICU 54.1
split collator_get_sort_key_variant3.phpt for icu 54.1
split ext/intl/tests/collator_create3.phpt for icu >= 54.1
Conflicts:
ext/intl/tests/dateformat_create_cal_arg_variant3.phpt
ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt
ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt
ext/intl/tests/dateformat_get_set_calendar_variant3.phpt
ext/intl/tests/dateformat_get_set_timezone_variant3.phpt
ext/intl/tests/dateformat_timezone_arg_variations3.phpt
ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt
Diffstat (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h')
0 files changed, 0 insertions, 0 deletions