aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorMiles Bader2007-08-21 04:51:30 +0000
committerMiles Bader2007-08-21 04:51:30 +0000
commitbdaf8a62d53cf8d5a0dc4f0dc530ecd6fc1f44fe (patch)
tree083bb8dc3faa311402bb8e86a67a4b9aeb207592 /etc
parentcb3fe75728ff4703c11aeb61c079a97da11ec637 (diff)
parent30a718e6b77f4f0c422f748dd14ea772b7fa2a1a (diff)
downloademacs-bdaf8a62d53cf8d5a0dc4f0dc530ecd6fc1f44fe.tar.gz
emacs-bdaf8a62d53cf8d5a0dc4f0dc530ecd6fc1f44fe.zip
Merge from emacs--rel--22
Patches applied: * emacs--rel--22 (patch 93-96) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 245) - Update from CVS Revision: emacs@sv.gnu.org/emacs--devo--0--patch-856
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 9fd1a50736c..2a09fa9c369 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12007-08-14 Glenn Morris <rgm@gnu.org>
2
3 * NEWS: Mention `bad-packages-alist'.
4
12007-08-08 Glenn Morris <rgm@gnu.org> 52007-08-08 Glenn Morris <rgm@gnu.org>
2 6
3 * TODO: `iff' item is dealt with. 7 * TODO: `iff' item is dealt with.