Merge from trunk and resolve conflicts.

[gnu-emacs] / etc / charsets / GBK.map

diff --git a/etc/charsets/GBK.map b/etc/charsets/GBK.map
index 76b3caa34b9aafcd58879182b4b3428c75d99ac1..16eabc49fddb6040d81496cee0c31c7fb4ad39be 100644 (file)
--- a/etc/charsets/GBK.map
+++ b/etc/charsets/GBK.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/GBK
+# Generated from GBK in localedate/charmaps of glibc
 0x8140 0x4E02
 0x8141-0x8143 0x4E04
 0x8144 0x4E0F