Merge from trunk and resolve conflicts.

[gnu-emacs] / etc / charsets / TIS-620.map

diff --git a/etc/charsets/TIS-620.map b/etc/charsets/TIS-620.map
index 15afc4dfe9060aa221faa87d3aec5ca64f23ae48..f747974062f9442e09116d048b2900dc02fa80d2 100644 (file)
--- a/etc/charsets/TIS-620.map
+++ b/etc/charsets/TIS-620.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/TIS-620
+# Generated from TIS-620 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0xA1-0xDA 0x0E01
 0xDF-0xFB 0x0E3F