Merge from trunk and resolve conflicts.

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

diff --git a/etc/charsets/IBM857.map b/etc/charsets/IBM857.map
index 9aca89ada7c4529b01b04fc7f236fae770ae4aef..da6524bd5aa4f1c9b3c23ce7cc53e08fcdc37a33 100644 (file)
--- a/etc/charsets/IBM857.map
+++ b/etc/charsets/IBM857.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM857
+# Generated from IBM857 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00C7
 0x81 0x00FC