diff options
author | Anatol Belski <ab@php.net> | 2014-11-20 13:37:13 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-11-20 13:37:13 +0100 |
commit | 548fe5617c5de75170ea0d3d5f600c9e25baae89 (patch) | |
tree | 7934e2898ed97df861214e028548c8977fc3d4c7 /sapi/apache2handler/php_functions.c | |
parent | 6bb201e46e900957c0ff87e9f3d14bdac14c076c (diff) | |
parent | e25b23d1c9f4d0eef08268516a31efa5e0a8aa31 (diff) | |
download | php-git-548fe5617c5de75170ea0d3d5f600c9e25baae89.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
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
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions