aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorChong Yidong2012-08-16 00:12:37 +0800
committerChong Yidong2012-08-16 00:12:37 +0800
commitddf0e868c2461257cb922f415dea8d713400c1f8 (patch)
tree7cabe2f3982468acfb495f2719de9a2343c61aa6 /admin
parent27d6c5a891036a40c1242f1f53cc794023f31283 (diff)
downloademacs-ddf0e868c2461257cb922f415dea8d713400c1f8.tar.gz
emacs-ddf0e868c2461257cb922f415dea8d713400c1f8.zip
Bump version to 24.2
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index abe759dc53c..57b5ac0bd24 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12012-08-15 Chong Yidong <cyd@gnu.org>
2
3 * Version 24.2 released.
4
12012-08-10 Glenn Morris <rgm@gnu.org> 52012-08-10 Glenn Morris <rgm@gnu.org>
2 6
3 * bzrmerge.el (bzrmerge-resolve): Disable local eval:. 7 * bzrmerge.el (bzrmerge-resolve): Disable local eval:.