diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
commit | 8d59503b977070aaa4e504e8d6dcb7da3711893e (patch) | |
tree | 8272c9c2cce43afa4fe4d8d92c269a6435242661 /iconvdata/gconv-modules | |
parent | 76a7dc16fab8853ef9230447fa98c70a3619dc6d (diff) | |
parent | bcea9593527d90b9f9ff3817e3fbf0fbc3d01fa7 (diff) |
Merge commit 'refs/top-bases/t/gsync-libc-merge' into t/gsync-libc-merge
Diffstat (limited to 'iconvdata/gconv-modules')
-rw-r--r-- | iconvdata/gconv-modules | 11 |
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 |