summaryrefslogtreecommitdiff
path: root/admin/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-01-15 12:42:23 -0800
committerGlenn Morris <rgm@gnu.org>2011-01-15 12:42:23 -0800
commit6fffc9003cf1a2677f04f6bc53ee96029816b3a9 (patch)
tree2025da26937271e5fe559518beff9597d712b904 /admin/ChangeLog
parentd52969e8afaa19ed1acc01f4ff0bb651bf7869a7 (diff)
bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator. (bzrmerge-resolve): Also ignore cl-loaddefs.el.
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 5807863a91..0fdd096789 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-15 Glenn Morris <rgm@gnu.org>
+
+ * bzrmerge.el (bzrmerge-missing): Add another skip indicator.
+ (bzrmerge-resolve): Also ignore cl-loaddefs.el.
+
2011-01-14 Glenn Morris <rgm@gnu.org>
* admin.el (set-copyright): Also handle \year in refcards/*.tex.