summaryrefslogtreecommitdiff
path: root/libc/localedata
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2008-06-20 09:26:44 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2008-06-20 09:26:44 +0000
commitff3e6f618d2dd1ec6887d2f3622f20889f876e1e (patch)
tree7bd685e3543aea58e3047c5ef60fa7a841ab0e73 /libc/localedata
parent96b85b5d0e370abaab4bf2d9129b6ad29d69e77a (diff)
downloadeglibc2-ff3e6f618d2dd1ec6887d2f3622f20889f876e1e.tar.gz
Merge changes between r6192 and r6403 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@6404 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/localedata')
-rw-r--r--libc/localedata/ChangeLog5
-rw-r--r--libc/localedata/locales/iso14651_t1_common3
2 files changed, 5 insertions, 3 deletions
diff --git a/libc/localedata/ChangeLog b/libc/localedata/ChangeLog
index 878b10cce..1863ce0ce 100644
--- a/libc/localedata/ChangeLog
+++ b/libc/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-21 Ulrich Drepper <drepper@redhat.com>
+
+ * locales/iso14651_t1_common: Remove U0C0D entry added for Telugu.
+ Reported by Pravin Satpute.
+
2008-05-16 Ulrich Drepper <drepper@redhat.com>
* locales/iso14651_t1_common: Remove duplicate U0C7B definition.
diff --git a/libc/localedata/locales/iso14651_t1_common b/libc/localedata/locales/iso14651_t1_common
index e9721fd07..fcbd897f0 100644
--- a/libc/localedata/locales/iso14651_t1_common
+++ b/libc/localedata/locales/iso14651_t1_common
@@ -3406,7 +3406,6 @@ order_start <TELUGU>;forward;forward;forward;forward,position
<U0C60> <tvw-vocalicrr>;<BAS>;<MIN>;IGNORE
<U0C0C> <tvw-vocalicl>;<BAS>;<MIN>;IGNORE
<U0C61> <tvw-vocalicll>;<BAS>;<MIN>;IGNORE
-<U0C0D> <tvw-candrae>;<BAS>;<MIN>;IGNORE
<U0C0E> <tvw-shorte>;<BAS>;<MIN>;IGNORE
<U0C0F> <tvw-e>;<BAS>;<MIN>;IGNORE
<U0C10> <tvw-ai>;<BAS>;<MIN>;IGNORE
@@ -3416,8 +3415,6 @@ order_start <TELUGU>;forward;forward;forward;forward,position
<U0C15> <t-ka>;<BAS>;<MIN>;IGNORE
<U0C16> <t-kha>;<BAS>;<MIN>;IGNORE
<U0C17> <t-ga>;<BAS>;<MIN>;IGNORE
-#XXX This is wrong since there is already a definition for U0C7B.
-#<U0C7B> <t-gga>;<BAS>;<MIN>;IGNORE
<U0C18> <t-gha>;<BAS>;<MIN>;IGNORE
<U0C19> <t-nga>;<BAS>;<MIN>;IGNORE
<U0C1A> <t-ca>;<BAS>;<MIN>;IGNORE