aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2015-01-30 00:01:24 -0800
committerGlenn Morris2015-01-30 00:01:24 -0800
commit2b9b98bdb70faf47405620fce9e5b5981a271d7c (patch)
tree255e2c482e6587acb647b57e1ffce6703a748d09 /ChangeLog
parent44ae1364908f91d877a6afa9bdd394e31fbd8311 (diff)
downloademacs-2b9b98bdb70faf47405620fce9e5b5981a271d7c.tar.gz
emacs-2b9b98bdb70faf47405620fce9e5b5981a271d7c.zip
# ChangeLog fixes
Merged ChangeLog entries go to the top, with the date of the merge. It's a simple rule.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b4993b7ac7..d7fd76cd305 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,7 @@
12 2015-01-15 update-copyright: apply to self 12 2015-01-15 update-copyright: apply to self
13 2015-01-11 update-copyright: recognize groff's \(co marker 13 2015-01-11 update-copyright: recognize groff's \(co marker
14 14
152015-01-20 Eli Zaretskii <eliz@gnu.org> 152015-01-28 Eli Zaretskii <eliz@gnu.org>
16 16
17 * configure.ac (HAVE_W32): Abort with error message if 17 * configure.ac (HAVE_W32): Abort with error message if
18 --without-toolkit-scroll-bars was specified. See 18 --without-toolkit-scroll-bars was specified. See