aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'admin/ChangeLog')
-rw-r--r--admin/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 1bbce2ea87a..145028ec815 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12012-08-28 Glenn Morris <rgm@gnu.org>
2
3 * bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.
4
12012-08-28 Andreas Schwab <schwab@linux-m68k.org> 52012-08-28 Andreas Schwab <schwab@linux-m68k.org>
2 6
3 * charsets/mule-charsets.el (header): Fix typo. 7 * charsets/mule-charsets.el (header): Fix typo.