emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108229: ChangeLog merge fixes


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108229: ChangeLog merge fixes
Date: Fri, 02 Nov 2012 01:49:05 -0000
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 108229
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-05-14 09:11:24 -0700
message:
  ChangeLog merge fixes
modified:
  doc/misc/ChangeLog
  lisp/ChangeLog
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-05-14 11:59:28 +0000
+++ b/doc/misc/ChangeLog        2012-05-14 16:11:24 +0000
@@ -1,4 +1,4 @@
-2012-05-12  Andreas Schwab  <address@hidden>
+2012-05-14  Andreas Schwab  <address@hidden>
 
        * cc-mode.texi: Avoid space before macro in 4th argument of cross
        reference commands.  (Bug#11461)

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-14 11:59:28 +0000
+++ b/lisp/ChangeLog    2012-05-14 16:11:24 +0000
@@ -1,9 +1,3 @@
-2012-05-14  Troels Nielsen  <address@hidden>  (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  <address@hidden>
 
        * net/rlogin.el (rlogin-mode-map): Fix last change.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]