summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-05-14 09:11:24 -0700
committerGlenn Morris <rgm@gnu.org>2012-05-14 09:11:24 -0700
commit2f4cadd1da7b681171c60fab8499f23f37ce4cb2 (patch)
tree0091b84465c7a70fa75a64b1d5fc9f294581df5a /lisp
parentd372248073cecc1d8ae1d6bed826692eab16274d (diff)
downloademacs-2f4cadd1da7b681171c60fab8499f23f37ce4cb2.tar.gz
ChangeLog merge fixes
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
1 files changed, 0 insertions, 6 deletions
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.