aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog
diff options
context:
space:
mode:
authorEli Zaretskii2012-10-09 20:28:06 +0200
committerEli Zaretskii2012-10-09 20:28:06 +0200
commitb97f22cdad55a0964758cef3a19ce3fa1098657d (patch)
tree8d078a5b2aab3f55708a5f8eeaf8ca0f022e6ee3 /admin/ChangeLog
parent87c141ce9750881f6203148e3c49d00710cd472e (diff)
parentb15736e6e33a52021a2a91b0b3360cd5a9803405 (diff)
downloademacs-b97f22cdad55a0964758cef3a19ce3fa1098657d.tar.gz
emacs-b97f22cdad55a0964758cef3a19ce3fa1098657d.zip
Merge from trunk.
Diffstat (limited to 'admin/ChangeLog')
-rw-r--r--admin/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7d4921887ce..c10ec67147b 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12012-10-09 Glenn Morris <rgm@gnu.org>
2
3 * admin.el (cusver-scan-cus-start): New function.
4 (cusver-check): Scan old cus-start.el.
5
12012-10-07 Glenn Morris <rgm@gnu.org> 62012-10-07 Glenn Morris <rgm@gnu.org>
2 7
3 * admin.el (cusver-new-version): Set default. 8 * admin.el (cusver-new-version): Set default.