ChangeLog merge fixes

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 812ec0214b0c874eb8452bdc19697286701f9a97..c7dd1d3fa824979b7818f4440afc557391270801 100644 (file)
--- 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 b833e61bfa253c1412b463e6c3c3bf9700e0a280..0d1c3529a146717a63fd230ef74e25a80113214a 100644 (file)
--- 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.