From: Glenn Morris <rgm@gnu.org>
Date: Mon, 14 May 2012 16:11:24 +0000 (-0700)
Subject: ChangeLog merge fixes
X-Git-Tag: emacs-24.2.90~471^2~86
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f4cadd1da7b681171c60fab8499f23f37ce4cb2;p=emacs.git

ChangeLog merge fixes
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 812ec0214b0..c7dd1d3fa82 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,4 +1,4 @@
-2012-05-12  Andreas Schwab  <schwab@linux-m68k.org>
+2012-05-14  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* cc-mode.texi: Avoid space before macro in 4th argument of cross
 	reference commands.  (Bug#11461)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b833e61bfa2..0d1c3529a14 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,3 @@
-2012-05-14  Troels Nielsen  <bn.troels@gmail.com>  (tiny change)
-
-	* progmodes/compile.el (compilation-internal-error-properties):
-	Calculate start position correctly when end-col is set but
-	end-line is not (Bug#11382).
-
 2012-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* net/rlogin.el (rlogin-mode-map): Fix last change.