com php-src: Merge branch '5.4': ext/intl/collator/collator_c reate.c ext/intl/collator/collator_sort.c ext/intl/co nfig.m4 ext/intl/config.w32
ext/intl/dateformat/d ateformat.c ext/intl/dateformat/dateformat_attr.c ext /intl/dateformat/dateformat_attr.h ext/intl/dateformat/da teformat_class.c
ext/intl/dateformat/dateformat_class .h ext/intl/dateformat/dateformat_format.c ext/intl/f ormatter/formatter_main.c ext/intl/grapheme/grapheme.h
ext/intl/intl_er

Commit: 06e06f026d14e7d61f2ceb14445a683abbbf91bb Author: Gustavo André dos Santos Lopes <cataphract@php.net> Mon, 30 Jul 2012 11:04:48 +0200 Parents: f8559194db82a231bbed547bd15f077e343914e4 86ca788cc753fca581275cd7dc9d7013a2720777 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=06e06f026d14e7d61f2ceb14445a683abbbf91bb Log: Merge branch '5.4' * 5.4: Fix test title and limit it to ICU >= 4.8 Remove executable bit from files Limit test to ICU 49 Remove executable bit from files Changed paths: MM ext/intl/collator/collator_create.c MM ext/intl/collator/collator_sort.c MM ext/intl/config.m4 MM ext/intl/config.w32 MM ext/intl/dateformat/dateformat.c MM ext/intl/dateformat/dateformat_attr.c MM ext/intl/dateformat/dateformat_attr.h MM ext/intl/dateformat/dateformat_class.c MM ext/intl/dateformat/dateformat_class.h MM ext/intl/dateformat/dateformat_format.c MM ext/intl/formatter/formatter_main.c MM ext/intl/grapheme/grapheme.h MM ext/intl/intl_error..c MM ext/intl/intl_error.h MM ext/intl/locale/locale_methods.c MM ext/intl/msgformat/msgformat.c MM ext/intl/msgformat/msgformat_attr.c MM ext/intl/msgformat/msgformat_data.c MM ext/intl/msgformat/msgformat_data.h MM ext/intl/msgformat/msgformat_format.c MM ext/intl/msgformat/msgformat_helpers.cpp MM ext/intl/msgformat/msgformat_helpers.h MM ext/intl/msgformat/msgformat_parse.c MM ext/intl/php_intl.c MM ext/intl/php_intl.h MM ext/intl/tests/badargs.phpt MM ext/intl/tests/dateformat_format.phpt MM ext/intl/tests/dateformat_format_parse.phpt MM ext/intl/tests/dateformat_get_set_calendar.phpt MM ext/intl/tests/dateformat_get_timezone_id.phpt Diff: diff --cc ext/intl/collator/collator_create.c index a3b7015,0f0cc19..a3b7015 mode 100755,100644..100644 --- a/ext/intl/collator/collator_create.c +++ b/ext/intl/collator/collator_create.c diff --cc ext/intl/collator/collator_sort.c index 04a24f0,0785111..04a24f0 mode 100755,100644..100644 --- a/ext/intl/collator/collator_sort.c +++ b/ext/intl/collator/collator_sort.c diff --cc ext/intl/config.m4 index 7c95c13,0477c7f..7c95c13 mode 100755,100644..100644 --- a/ext/intl/config.m4 +++ b/ext/intl/config.m4 diff --cc ext/intl/config.w32 index a499187,437fedb..a499187 mode 100755,100644..100644 --- a/ext/intl/config.w32 +++ b/ext/intl/config.w32 diff --cc ext/intl/dateformat/dateformat.c index fb83eee,b399a39..fb83eee mode 100755,100644..100644 --- a/ext/intl/dateformat/dateformat.c +++ b/ext/intl/dateformat/dateformat.c diff --cc ext/intl/dateformat/dateformat_attr.c index a32a486,6131ced..a32a486 mode 100755,100644..100644 --- a/ext/intl/dateformat/dateformat_attr.c +++ b/ext/intl/dateformat/dateformat_attr.c diff --cc ext/intl/dateformat/dateformat_attr.h index 6fe82a6,bf28824..6fe82a6 mode 100755,100644..100644 --- a/ext/intl/dateformat/dateformat_attr.h +++ b/ext/intl/dateformat/dateformat_attr.h diff --cc ext/intl/dateformat/dateformat_class.c index fc4a8b8,a9e06c1..fc4a8b8 mode 100755,100644..100644 --- a/ext/intl/dateformat/dateformat_class.c +++ b/ext/intl/dateformat/dateformat_class.c diff --cc ext/intl/dateformat/dateformat_class.h index de5cf4a,9ad83ee..de5cf4a mode 100755,100644..100644 --- a/ext/intl/dateformat/dateformat_class.h +++ b/ext/intl/dateformat/dateformat_class.h diff --cc ext/intl/dateformat/dateformat_format.c index ffae155,4d03d92..ffae155 mode 100755,100644..100644 --- a/ext/intl/dateformat/dateformat_format.c +++ b/ext/intl/dateformat/dateformat_format.c diff --cc ext/intl/formatter/formatter_main.c index 96f1bcf,8fa1756..96f1bcf mode 100755,100644..100644 --- a/ext/intl/formatter/formatter_main.c +++ b/ext/intl/formatter/formatter_main.c diff --cc ext/intl/grapheme/grapheme.h index 756ce91,c0e697a..756ce91 mode 100755,100644..100644 --- a/ext/intl/grapheme/grapheme.h +++ b/ext/intl/grapheme/grapheme.h diff --cc ext/intl/intl_error.c index 99b1c60,9c2e13d..99b1c60 mode 100755,100644..100644 --- a/ext/intl/intl_error.c +++ b/ext/intl/intl_error.c diff --cc ext/intl/intl_error.h index 4d8eb79,3adae85..4d8eb79 mode 100755,100644..100644 --- a/ext/intl/intl_error.h +++ b/ext/intl/intl_error.h diff --cc ext/intl/locale/locale_methods.c index d1a86d8,1707c69..d1a86d8 mode 100755,100644..100644 --- a/ext/intl/locale/locale_methods.c +++ b/ext/intl/locale/locale_methods.c diff --cc ext/intl/msgformat/msgformat.c index 45e5c71,0a01204..45e5c71 mode 100755,100644..100644 --- a/ext/intl/msgformat/msgformat.c +++ b/ext/intl/msgformat/msgformat.c diff --cc ext/intl/msgformat/msgformat_attr.c index c333a24,ed2dae2..c333a24 mode 100755,100644..100644 --- a/ext/intl/msgformat/msgformat_attr.c +++ b/ext/intl/msgformat/msgformat_attr.c diff --cc ext/intl/msgformat/msgformat_data.c index 5d49054,527c1d4..5d49054 mode 100755,100644..100644 --- a/ext/intl/msgformat/msgformat_data.c +++ b/ext/intl/msgformat/msgformat_data.c diff --cc ext/intl/msgformat/msgformat_data.h index 51d7687,6479888..51d7687 mode 100755,100644..100644 --- a/ext/intl/msgformat/msgformat_data.h +++ b/ext/intl/msgformat/msgformat_data.h diff --cc ext/intl/msgformat/msgformat_format.c index 4b81cfe,9a18ac0..4b81cfe mode 100755,100644..100644 --- a/ext/intl/msgformat/msgformat_format.c +++ b/ext/intl/msgformat/msgformat_format.c diff --cc ext/intl/msgformat/msgformat_helpers.cpp index 9ee1cdc,1895de2..9ee1cdc mode 100755,100644..100644 --- a/ext/intl/msgformat/msgformat_helpers.cpp +++ b/ext/intl/msgformat/msgformat_helpers.cpp diff --cc ext/intl/msgformat/msgformat_helpers.h index e6eda08,30c7e39..e6eda08 mode 100755,100644..100644 --- a/ext/intl/msgformat/msgformat_helpers.h +++ b/ext/intl/msgformat/msgformat_helpers.h diff --cc ext/intl/msgformat/msgformat_parse.c index 413d3b1,f540b1d..413d3b1 mode 100755,100644..100644 --- a/ext/intl/msgformat/msgformat_parse.c +++ b/ext/intl/msgformat/msgformat_parse.c diff --cc ext/intl/php_intl.c index 78da0f5,efe0ddd..78da0f5 mode 100755,100644..100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c diff --cc ext/intl/php_intl.h index 7a71123,4ede069..7a71123 mode 100755,100644..100644 --- a/ext/intl/php_intl.h +++ b/ext/intl/php_intl.h diff --cc ext/intl/tests/badargs.phpt index b8f48b3,9232bbf..b8f48b3 mode 100755,100644..100644 --- a/ext/intl/tests/badargs.phpt +++ b/ext/intl/tests/badargs.phpt diff --cc ext/intl/tests/dateformat_format.phpt index 8664eea,e554819..8664eea mode 100755,100644..100644 --- a/ext/intl/tests/dateformat_format.phpt +++ b/ext/intl/tests/dateformat_format.phpt diff --cc ext/intl/tests/dateformat_format_parse.phpt index 6bd3d8a,bd41d71..6bd3d8a mode 100755,100644..100644 --- a/ext/intl/tests/dateformat_format_parse.phpt +++ b/ext/intl/tests/dateformat_format_parse.phpt diff --cc ext/intl/tests/dateformat_get_set_calendar.phpt index e792ea3,bfd4e57..e792ea3 mode 100755,100644..100644 --- a/ext/intl/tests/dateformat_get_set_calendar.phpt +++ b/ext/intl/tests/dateformat_get_set_calendar.phpt diff --cc ext/intl/tests/dateformat_get_timezone_id.phpt index a9701c3,80cbdbb..a9701c3 mode 100755,100644..100644 --- a/ext/intl/tests/dateformat_get_timezone_id.phpt +++ b/ext/intl/tests/dateformat_get_timezone_id.phpt