summaryrefslogtreecommitdiff
path: root/admin/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'admin/ChangeLog')
-rw-r--r--admin/ChangeLog9
1 files changed, 8 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5b714193ab1..ca310c1b8f1 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,4 +1,4 @@
-2011-01-14 Paul Eggert <eggert@cs.ucla.edu>
+2011-01-17 Paul Eggert <eggert@cs.ucla.edu>
Update copyright notes to match recent gnulib-related changes.
* notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
@@ -9,6 +9,13 @@
subsumed by m4/*.m4 rule). config.guess, config.sub, and
doc/man/texinfo.tex are now copied in from gnulib.
+2011-01-15 Glenn Morris <rgm@gnu.org>
+
+ * charsets/cp51932.awk, charsets/eucjp-ms.awk: No longer print arch-tag.
+
+ * 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.