Merge from trunk and resolve conflicts.

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

diff --git a/etc/charsets/IBM855.map b/etc/charsets/IBM855.map
index 7018b57bd9a07c62fba70f7dce0cc2b1b37c00db..450d3cf7496274881b9bb44e7f9130b45b71b7ea 100644 (file)
--- a/etc/charsets/IBM855.map
+++ b/etc/charsets/IBM855.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM855
+# Generated from IBM855 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x0452
 0x81 0x0402