Merge from trunk and resolve conflicts.

[gnu-emacs] / etc / charsets / CNS-5.map

diff --git a/etc/charsets/CNS-5.map b/etc/charsets/CNS-5.map
index f8095275bd75b0b12c6557c9b4cd21fc3aecb9b7..bf6bb9d4653d949a3aad18061a159b25d72a3246 100644 (file)
--- a/etc/charsets/CNS-5.map
+++ b/etc/charsets/CNS-5.map
@@ -1,4 +1,5 @@
-# Generated from data at http://sourceforge.net/cvs/?group_id=26261
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
+# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x200D1
 0x2122 0x200CB
 0x2123 0x200C9