summaryrefslogtreecommitdiff
path: root/iconvdata/gconv-modules
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 16:33:27 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 16:33:27 +0000
commit064374be911f72dfaec8a75f06da1f9fc1827712 (patch)
treead96fd1f1b9b57a50005db7803f6b79e748bb820 /iconvdata/gconv-modules
parent4dc1e6e42f1f602e1d2227e112f2db8dce9da763 (diff)
parent7c7d34a16f08f84427b3f617313d9633423ad5eb (diff)
Merge commit 'refs/top-bases/t/hurdsig-global-dispositions' into t/hurdsig-global-dispositions
Diffstat (limited to 'iconvdata/gconv-modules')
-rw-r--r--iconvdata/gconv-modules11
1 files changed, 10 insertions, 1 deletions
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 11274dd2a9..81687c1619 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1,5 +1,5 @@
# GNU libc iconv configuration.
-# Copyright (C) 1997-2016 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -744,6 +744,13 @@ module IBM850// INTERNAL IBM850 1
module INTERNAL IBM850// IBM850 1
# from to module cost
+alias CP858// IBM858//
+alias 858// IBM858//
+alias CSPC858MULTILINGUAL// IBM858//
+module IBM858// INTERNAL IBM858 1
+module INTERNAL IBM858// IBM858 1
+
+# from to module cost
alias CP851// IBM851//
alias 851// IBM851//
alias CSIBM851// IBM851//
@@ -1556,6 +1563,7 @@ module MAC-SAMI// INTERNAL MAC-SAMI 1
module INTERNAL MAC-SAMI// MAC-SAMI 1
# from to module cost
+alias ARMSCII8// ARMSCII-8//
module ARMSCII-8// INTERNAL ARMSCII-8 1
module INTERNAL ARMSCII-8// ARMSCII-8 1
@@ -1571,6 +1579,7 @@ module EUC-JISX0213// INTERNAL EUC-JISX0213 1
module INTERNAL EUC-JISX0213// EUC-JISX0213 1
# from to module cost
+alias ShiftJISX0213// Shift_JISX0213//
module Shift_JISX0213// INTERNAL SHIFT_JISX0213 1
module INTERNAL Shift_JISX0213// SHIFT_JISX0213 1