This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.20-325-gda5bcaa
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Dec 2014 11:36:15 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-325-gda5bcaa
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via da5bcaa49916fd99c1cd2bfe11923e680056abd7 (commit)
from 6d248857845aee307440a77062a93b167cd2ac9c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=da5bcaa49916fd99c1cd2bfe11923e680056abd7
commit da5bcaa49916fd99c1cd2bfe11923e680056abd7
Author: Andreas Schwab <schwab@suse.de>
Date: Thu Dec 11 12:33:15 2014 +0100
Remove duplication from gconv-modules
diff --git a/ChangeLog b/ChangeLog
index 75c6e9a..e388d0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-11 Andreas Schwab <schwab@suse.de>
+
+ * iconvdata/gconv-modules: Remove duplicate entry.
+
2014-12-11 Will Newton <will.newton@linaro.org>
Merge gettext 0.19.3 into intl/.
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index d3631c0..b894fec 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1630,13 +1630,6 @@ module IBM1155// INTERNAL IBM1155 1
module INTERNAL IBM1155// IBM1155 1
# from to module cost
-alias IBM-1155// IBM1155//
-alias CP1155// IBM1155//
-alias CSIBM1155// IBM1155//
-module IBM1155// INTERNAL IBM1155 1
-module INTERNAL IBM1155// IBM1155 1
-
-# from to module cost
alias IBM-1156// IBM1156//
alias CP1156// IBM1156//
alias CSIBM1156// IBM1156//
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
iconvdata/gconv-modules | 7 -------
2 files changed, 4 insertions(+), 7 deletions(-)
hooks/post-receive
--
GNU C Library master sources