From: Kenichi Handa <handa@gnu.org>
Date: Sun, 14 Oct 2012 08:06:11 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.2.90~235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9fe32d61c5655878f877522ac4bcc251d092f732;p=emacs.git

merge trunk
---

9fe32d61c5655878f877522ac4bcc251d092f732
diff --cc etc/ChangeLog
index 27237ca0f61,0a1a5b8b8b7..4e1f15e913d
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2012-10-14  Kenichi Handa  <handa@gnu.org>
 +
 +	* charsets/JISC6226.map: Re-generated.
 +
+ 2012-10-14  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* compilation.txt (msft): Add error messages in new Studio 2010
+ 	format.
+ 
  2012-10-11  Kenichi Handa  <handa@gnu.org>
  
  	* charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map,