aboutsummaryrefslogtreecommitdiffstats
path: root/admin/charsets/mapfiles/README
diff options
context:
space:
mode:
authorStefan Monnier2012-03-25 16:37:21 -0400
committerStefan Monnier2012-03-25 16:37:21 -0400
commit699c782b7668c44d0fa4446331b0590a6d5dac82 (patch)
tree5dcce364741d0761920a3d274b0fc8aba4103d45 /admin/charsets/mapfiles/README
parent98fb480ee31bf74cf554044f60f21df16566dd7f (diff)
parente99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff)
downloademacs-pending.tar.gz
emacs-pending.zip
Merge from trunkpending
Diffstat (limited to 'admin/charsets/mapfiles/README')
-rw-r--r--admin/charsets/mapfiles/README4
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README
index c1804af98cd..b43611db11d 100644
--- a/admin/charsets/mapfiles/README
+++ b/admin/charsets/mapfiles/README
@@ -1,4 +1,4 @@
1Copyright (C) 2009-2011 Free Software Foundation, Inc. 1Copyright (C) 2009-2012 Free Software Foundation, Inc.
2Copyright (C) 2009, 2010, 2011 2Copyright (C) 2009, 2010, 2011
3 National Institute of Advanced Industrial Science and Technology (AIST) 3 National Institute of Advanced Industrial Science and Technology (AIST)
4 Registration Number H13PRO009 4 Registration Number H13PRO009
@@ -6,7 +6,7 @@ See the end of the file for license conditions.
6 6
7 The charset map files directory 7 The charset map files directory
8 8
9This directory contains two kinds of charse map files; verbatim copies 9This directory contains two kinds of charset map files; verbatim copies
10(or their compressed versions) of files freely available in the 10(or their compressed versions) of files freely available in the
11Internet, and newly created files based on freely available 11Internet, and newly created files based on freely available
12information. 12information.