Merge from trunk and resolve conflicts.

[gnu-emacs] / etc / charsets / 8859-15.map

diff --git a/etc/charsets/8859-15.map b/etc/charsets/8859-15.map
index 621865c73d5640afb8b94c9f18e7a3a2601853d3..6880fef787528d6f45ac52d85c8f79203ca76049 100644 (file)
--- a/etc/charsets/8859-15.map
+++ b/etc/charsets/8859-15.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-15
+# Generated from ISO-8859-15 in localedate/charmaps of glibc
 0x00-0xA3 0x0000
 0xA4 0x20AC
 0xA5 0x00A5