aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2011-01-15 14:44:52 -0800
committerGlenn Morris2011-01-15 14:44:52 -0800
commit623717b76c9ee3a76ba49f93d6619870db1392e7 (patch)
treee0b6e600da84c9c1081e17c0e219925cf0ae5552 /admin/ChangeLog
parentd0d4361dba5ea4b3d88e9c6724c5bb6dc2894470 (diff)
downloademacs-623717b76c9ee3a76ba49f93d6619870db1392e7.tar.gz
emacs-623717b76c9ee3a76ba49f93d6619870db1392e7.zip
* admin/charsets/eucjp-ms.awk: No longer print arch-tag.
Diffstat (limited to 'admin/ChangeLog')
-rw-r--r--admin/ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 0fdd0967892..28ab20069d6 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,7 @@
12011-01-15 Glenn Morris <rgm@gnu.org> 12011-01-15 Glenn Morris <rgm@gnu.org>
2 2
3 * charsets/eucjp-ms.awk: No longer print arch-tag.
4
3 * bzrmerge.el (bzrmerge-missing): Add another skip indicator. 5 * bzrmerge.el (bzrmerge-missing): Add another skip indicator.
4 (bzrmerge-resolve): Also ignore cl-loaddefs.el. 6 (bzrmerge-resolve): Also ignore cl-loaddefs.el.
5 7