aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog
diff options
context:
space:
mode:
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 6a698728b6c..b15d49f9e50 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12011-01-17 Paul Eggert <eggert@cs.ucla.edu>
2
3 * notes/bzr (Installing changes from gnulib): New section.
4 Need for this suggested by Stefan Monnier.
5
12011-01-17 Stefan Monnier <monnier@iro.umontreal.ca> 62011-01-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in 8 * bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in