com php-src: Merge branch '5.3' into 5.4: ext/intl/collator/col lator_class.c ext/intl/common/common_error.c ext/in tl/config.m4 ext/intl/config.w32
ext/intl/datefor mat/dateformat_class.c ext/intl/doc/collator_api.php ext/intl/doc/common_api.php ext/intl/doc/datefmt_api .php
ext/intl/doc/formatter_api.php ext/intl/doc/msgf mt_api.php ext/intl/formatter/formatter_class.c ext /intl/grapheme/grapheme_string.c
ext/intl/intl_convert .c ext/intl/locale/local

Commit: dec7bad63504e828f2111265d1bb6624951c0548 Author: Gustavo André dos Santos Lopes <cataphract@php.net> Mon, 30 Jul 2012 10:31:10 +0200 Parents: e0c014deadc4d858507b83fab49e95b7f06954dc 7e3e1837c8e60ad87e9b7aee6cb306a843f5c784 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dec7bad63504e828f2111265d1bb6624951c0548 Log: Merge branch '5.3' into 5.4 * 5.3: Limit test to ICU 49 Remove executable bit from files Changed paths: MM ext/intl/collator/collator_class.c MM ext/intl/common/common_error.c MM ext/intl/config.m4 MM ext/intl/config.w32 MM ext/intl/dateformat/dateformat_class.c MM ext/intl/doc/collator_api..php MM ext/intl/doc/common_api.php MM ext/intl/doc/datefmt_api.php MM ext/intl/doc/formatter_api.php MM ext/intl/doc/msgfmt_api.php MM ext/intl/formatter/formatter_class.c MM ext/intl/grapheme/grapheme_string.c MM ext/intl/intl_convert.c MM ext/intl/locale/locale_class.c MM ext/intl/msgformat/msgformat_class.c MM ext/intl/normalizer/normalizer_class.c MM ext/intl/normalizer/normalizer_normalize.c MM ext/intl/php_intl.c MM ext/intl/tests/formatter_get_error.phpt MM ext/intl/tests/locale_accept.phpt Diff: diff --cc ext/intl/collator/collator_class.c index d1fa10e,38b2e97..d1fa10e mode 100755,100644..100644 --- a/ext/intl/collator/collator_class.c +++ b/ext/intl/collator/collator_class.c diff --cc ext/intl/common/common_error.c index a0ee7c1,3ab7fdf..a0ee7c1 mode 100755,100644..100644 --- a/ext/intl/common/common_error.c +++ b/ext/intl/common/common_error.c diff --cc ext/intl/config.m4 index 0477c7f,dc235db..0477c7f mode 100755,100644...100644 --- a/ext/intl/config.m4 +++ b/ext/intl/config.m4 diff --cc ext/intl/config.w32 index 437fedb,68ccadf..437fedb mode 100755,100644..100644 --- a/ext/intl/config.w32 +++ b/ext/intl/config.w32 diff --cc ext/intl/dateformat/dateformat_class.c index a9e06c1,eb3f5f4..a9e06c1 mode 100755,100644..100644 --- a/ext/intl/dateformat/dateformat_class.c +++ b/ext/intl/dateformat/dateformat_class.c diff --cc ext/intl/doc/collator_api.php index ef72502,5428783..ef72502 mode 100755,100644..100644 --- a/ext/intl/doc/collator_api.php +++ b/ext/intl/doc/collator_api.php diff --cc ext/intl/doc/common_api.php index 993dab1,ce2329f..993dab1 mode 100755,100644..100644 --- a/ext/intl/doc/common_api.php +++ b/ext/intl/doc/common_api.php diff --cc ext/intl/doc/datefmt_api.php index 272abdb,0c5002e..272abdb mode 100755,100644..100644 --- a/ext/intl/doc/datefmt_api.php +++ b/ext/intl/doc/datefmt_api.php diff --cc ext/intl/doc/formatter_api.php index 14d98db,754b16c..14d98db mode 100755,100644...100644 --- a/ext/intl/doc/formatter_api.php +++ b/ext/intl/doc/formatter_api.php diff --cc ext/intl/doc/msgfmt_api.php index e4d047b,5d178f1...e4d047b mode 100755,100644..100644 --- a/ext/intl/doc/msgfmt_api.php +++ b/ext/intl/doc/msgfmt_api.php diff --cc ext/intl/formatter/formatter_class.c index 28af14e,0bb5894..28af14e mode 100755,100644..100644 --- a/ext/intl/formatter/formatter_class.c +++ b/ext/intl/formatter/formatter_class.c diff --cc ext/intl/grapheme/grapheme_string.c index 475bbe4,0b7ecdb..475bbe4 mode 100755,100644..100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c diff --cc ext/intl/intl_convert.c index 92cdc4c,33f1730..92cdc4c mode 100755,100644...100644 --- a/ext/intl/intl_convert.c +++ b/ext/intl/intl_convert.c diff --cc ext/intl/locale/locale_class.c index 432cfb2,d433bf5..432cfb2 mode 100755,100644..100644 --- a/ext/intl/locale/locale_class.c +++ b/ext/intl/locale/locale_class.c diff --cc ext/intl/msgformat/msgformat_class.c index 8145a46,7ed28df..8145a46 mode 100755,100644..100644 --- a/ext/intl/msgformat/msgformat_class.c +++ b/ext/intl/msgformat/msgformat_class.c diff --cc ext/intl/normalizer/normalizer_class.c index 154d877,c5adf78..154d877 mode 100755,100644..100644 --- a/ext/intl/normalizer/normalizer_class.c +++ b/ext/intl/normalizer/normalizer_class.c diff --cc ext/intl/normalizer/normalizer_normalize.c index f46285e,466ab97..f46285e mode 100755,100644..100644 --- a/ext/intl/normalizer/normalizer_normalize.c +++ b/ext/intl/normalizer/normalizer_normalize.c diff --cc ext/intl/php_intl.c index efe0ddd,dc6c0ff..efe0ddd mode 100755,100644..100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c diff --cc ext/intl/tests/formatter_get_error.phpt index acb683e,c7b3972..acb683e mode 100755,100644..100644 --- a/ext/intl/tests/formatter_get_error.phpt +++ b/ext/intl/tests/formatter_get_error.phpt diff --cc ext/intl/tests/locale_accept.phpt index cf1dc6e,923571f..cf1dc6e mode 100755,100644..100644 --- a/ext/intl/tests/locale_accept.phpt +++ b/ext/intl/tests/locale_accept.phpt