aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-08-14 15:21:23 -0700
committerPaul Eggert2015-08-14 15:21:58 -0700
commit293775f10555f7da7e61ed8dbdb78d72f30f7e2d (patch)
tree23e49378fbee66ffc10d1ac34f1cc73478879150
parent1735729e9b3d8c8e4e8385f9601802f2841774fc (diff)
downloademacs-293775f10555f7da7e61ed8dbdb78d72f30f7e2d.tar.gz
emacs-293775f10555f7da7e61ed8dbdb78d72f30f7e2d.zip
; Fix ChangeLog entry put into wrong file
-rw-r--r--ChangeLog.24
-rw-r--r--doc/emacs/ChangeLog.14
2 files changed, 1 insertions, 7 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2
index 423de5d43a0..3f31807049c 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -19,9 +19,7 @@
19 19
202015-08-14 Ronnie Schnell <ronnie@driver-aces.com> 202015-08-14 Ronnie Schnell <ronnie@driver-aces.com>
21 21
22 Fixed typo in manual. 22 * doc/emacs/misc.text (Amusements): Fixed typo.
23
24 Fixed typo in manual.
25 23
262015-08-14 Eli Zaretskii <eliz@gnu.org> 242015-08-14 Eli Zaretskii <eliz@gnu.org>
27 25
diff --git a/doc/emacs/ChangeLog.1 b/doc/emacs/ChangeLog.1
index 395796cc5f7..469fdc39cea 100644
--- a/doc/emacs/ChangeLog.1
+++ b/doc/emacs/ChangeLog.1
@@ -1,7 +1,3 @@
12015-08-14 Ronnie Schnell <ronnie@driver-aces.com>
2
3 * misc.text (Amusements): Fixed typo.
4
52015-03-29 Dani Moncayo <dmoncayo@gmail.com> 12015-03-29 Dani Moncayo <dmoncayo@gmail.com>
6 2
7 * files.texi (Diff Mode): Doc fix. 3 * files.texi (Diff Mode): Doc fix.