aboutsummaryrefslogtreecommitdiffstats
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorKenichi Handa2012-10-14 17:06:11 +0900
committerKenichi Handa2012-10-14 17:06:11 +0900
commit9fe32d61c5655878f877522ac4bcc251d092f732 (patch)
tree584f4c85fd2e44e8e7d597382f177359b737acb1 /etc/ChangeLog
parentf5772b8eaee90d0b50a60bd55d9d28805a2543cb (diff)
parent8111f5e6f05228e36496f3bdccad711f569acb9b (diff)
downloademacs-9fe32d61c5655878f877522ac4bcc251d092f732.tar.gz
emacs-9fe32d61c5655878f877522ac4bcc251d092f732.zip
merge trunk
Diffstat (limited to 'etc/ChangeLog')
-rw-r--r--etc/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 27237ca0f61..4e1f15e913d 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -2,6 +2,11 @@
2 2
3 * charsets/JISC6226.map: Re-generated. 3 * charsets/JISC6226.map: Re-generated.
4 4
52012-10-14 Eli Zaretskii <eliz@gnu.org>
6
7 * compilation.txt (msft): Add error messages in new Studio 2010
8 format.
9
52012-10-11 Kenichi Handa <handa@gnu.org> 102012-10-11 Kenichi Handa <handa@gnu.org>
6 11
7 * charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map, 12 * charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map,