Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	localedata/ChangeLog
This commit is contained in:
Ulrich Drepper 2011-05-09 09:01:52 -04:00
commit 0f7843d00f
2 changed files with 9 additions and 4 deletions

View File

@ -5,6 +5,11 @@
Contributed by Soslan Khubulov <soslanx@gmail.com>. Contributed by Soslan Khubulov <soslanx@gmail.com>.
* SUPPORTED: Add entry for os_RU. * SUPPORTED: Add entry for os_RU.
2010-12-02 Andreas Schwab <schwab@redhat.com>
* SUPPORTED: Remove .UTF-8 suffix from az_AZ, as_IN, tt_RU locale
names.
2010-05-17 Andreas Schwab <schwab@redhat.com> 2010-05-17 Andreas Schwab <schwab@redhat.com>
* locales/es_CR (LC_ADDRESS): Fix character names in lang_ab. * locales/es_CR (LC_ADDRESS): Fix character names in lang_ab.

View File

@ -46,8 +46,8 @@ ar_TN.UTF-8/UTF-8 \
ar_TN/ISO-8859-6 \ ar_TN/ISO-8859-6 \
ar_YE.UTF-8/UTF-8 \ ar_YE.UTF-8/UTF-8 \
ar_YE/ISO-8859-6 \ ar_YE/ISO-8859-6 \
az_AZ.UTF-8/UTF-8 \ az_AZ/UTF-8 \
as_IN.UTF-8/UTF-8 \ as_IN/UTF-8 \
ast_ES.UTF-8/UTF-8 \ ast_ES.UTF-8/UTF-8 \
ast_ES/ISO-8859-15 \ ast_ES/ISO-8859-15 \
be_BY.UTF-8/UTF-8 \ be_BY.UTF-8/UTF-8 \
@ -386,8 +386,8 @@ tr_CY/ISO-8859-9 \
tr_TR.UTF-8/UTF-8 \ tr_TR.UTF-8/UTF-8 \
tr_TR/ISO-8859-9 \ tr_TR/ISO-8859-9 \
ts_ZA/UTF-8 \ ts_ZA/UTF-8 \
tt_RU.UTF-8/UTF-8 \ tt_RU/UTF-8 \
tt_RU.UTF-8@iqtelif/UTF-8 \ tt_RU@iqtelif/UTF-8 \
ug_CN/UTF-8 \ ug_CN/UTF-8 \
uk_UA.UTF-8/UTF-8 \ uk_UA.UTF-8/UTF-8 \
uk_UA/KOI8-U \ uk_UA/KOI8-U \