summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2010-12-04 18:51:04 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2010-12-04 18:51:04 +0000
commitdc7c533314ec173b188ff1447d470ef620879ad1 (patch)
tree161e4aadad5a8cb558d0198c77ff63bc0bffecb2
parentb0c71d0b1f2f3c3406f55da7605b98cb2ca1fb58 (diff)
downloadiconv-dc7c533314ec173b188ff1447d470ef620879ad1.tar.gz
iconv-dc7c533314ec173b188ff1447d470ef620879ad1.tar.bz2
Sync aliases with hubbub
svn path=/trunk/iconv/; revision=10975
-rw-r--r--aliases/data/aliases-bottom1
-rw-r--r--aliases/makealiases.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/aliases/data/aliases-bottom b/aliases/data/aliases-bottom
index fb68432..5f58d9d 100644
--- a/aliases/data/aliases-bottom
+++ b/aliases/data/aliases-bottom
@@ -28,6 +28,7 @@ CP874 3004 WINDOWS-874
#MACTHAI 3024 X-MAC-THAI MAC-THAI
#MACTURKISH 3025 X-MAC-TURKISH MAC-TURKISH
#MULELAO-1 3026
+CP949 3027 WINDOWS-949
# From Unicode Lib
ISO-IR-182 4000
diff --git a/aliases/makealiases.c b/aliases/makealiases.c
index f24370b..370a234 100644
--- a/aliases/makealiases.c
+++ b/aliases/makealiases.c
@@ -35,7 +35,7 @@ struct extra {
{ "ISO-10646-UCS-4", "UCS-4 UCS4" },
{ "ISO-10646-UCS-2", "UCS-2 UCS2" },
{ "GB2312", "EUC-CN EUCCN CN-GB" },
- { "Big5", "BIG-FIVE BIG-5 CN-BIG5 BIG_FIVE" },
+ { "Big5", "BIG-FIVE BIG-5 CN-BIG5 BIG_FIVE x-x-big5" },
{ "macintosh", "MACROMAN MAC-ROMAN X-MAC-ROMAN" },
{ "windows-1250", "CP1250 MS-EE" },
{ "windows-1251", "CP1251 MS-CYRL" },