com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/intl/test s/dateformat_formatObject_datetime_variant3.phpt

From: Date: Thu, 20 Nov 2014 12:36:37 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/intl/test s/dateformat_formatObject_datetime_variant3.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83180@lists.php.net to get a copy of this message
Commit: e25b23d1c9f4d0eef08268516a31efa5e0a8aa31 Author: Anatol Belski <ab@php.net> Thu, 20 Nov 2014 13:36:37 +0100 Parents: 9fd54bd9d8f20f4d56c3d8e0209c6c34fb3bfc98 6c3768b15410ca2b70a4c2ba31d2a7f0d7c53ad3 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e25b23d1c9f4d0eef08268516a31efa5e0a8aa31 Log: 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 Changed paths: MM ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt Diff:

« previous php.cvs (#83180) next »