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 01f10f4aea5..deb83a96b50 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12012-05-19 Paul Eggert <eggert@cs.ucla.edu>
2
3 * CPP-DEFINES (HAVE_FTIME): Remove.
4
12012-05-02 Glenn Morris <rgm@gnu.org> 52012-05-02 Glenn Morris <rgm@gnu.org>
2 6
3 * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit". 7 * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".