aboutsummaryrefslogtreecommitdiff
path: root/libX11
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-10-29 06:41:31 +0000
committermarha <marha@users.sourceforge.net>2010-10-29 06:41:31 +0000
commit5c8222f5274c5d56e260d72192d536a7228cfbc8 (patch)
treeb6b265decf4a31eed6fb5cb2939bfb69365b3cac /libX11
parenta769e525374f80f0650699a2c97ad020cc76ea6d (diff)
parent3eee9271d2345cb54c1778629ba3cf3b804c2671 (diff)
downloadvcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.tar.gz
vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.tar.bz2
vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.zip
svn merge ^/branches/released .
Diffstat (limited to 'libX11')
-rw-r--r--libX11/nls/locale.alias.pre2
1 files changed, 2 insertions, 0 deletions
diff --git a/libX11/nls/locale.alias.pre b/libX11/nls/locale.alias.pre
index be26de621..25f06d430 100644
--- a/libX11/nls/locale.alias.pre
+++ b/libX11/nls/locale.alias.pre
@@ -10,10 +10,12 @@ POSIX: C
POSIX-UTF2: C
C_C.C: C
C.en: C
+C.ASCII: C
C.iso88591: en_US.ISO8859-1
Cextend: en_US.ISO8859-1
Cextend.en: en_US.ISO8859-1
English_United-States.437: C
+C.UTF-8: en_US.UTF-8
XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
a3: a3_AZ.KOI8-C
a3_AZ: a3_AZ.KOI8-C