aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorJuanma Barranquero2010-10-14 16:32:27 +0200
committerJuanma Barranquero2010-10-14 16:32:27 +0200
commit220d91b834f7f7252b9953460422151b86b3520c (patch)
tree8f3e16983e83ac0da6beef346cb05cd2591a7f83 /ChangeLog
parent31e96eecc09283b5169faf0d5dc1c8efd58539ac (diff)
parent9d4f32e88a1b642070f0adb41df04a0846c31970 (diff)
downloademacs-220d91b834f7f7252b9953460422151b86b3520c.tar.gz
emacs-220d91b834f7f7252b9953460422151b86b3520c.zip
Merge changes from emacs-23 branch.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d1737619a4..4c5acca4dc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12010-10-14 Glenn Morris <rgm@gnu.org>
2
3 * BUGS, INSTALL.BZR, README: Updates.
4
12010-10-13 Glenn Morris <rgm@gnu.org> 52010-10-13 Glenn Morris <rgm@gnu.org>
2 6
3 * make-dist: Remove --compress. Check for the appropriate 7 * make-dist: Remove --compress. Check for the appropriate