aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2012-01-23 15:10:06 +0100
committerJoakim Verona2012-01-23 15:10:06 +0100
commit0322b140eead7c94de7f0f6d19a90bd15690b4eb (patch)
tree950c011783cc896d0450084cb5155e54548bfe5b /admin/ChangeLog
parentd5114bfea3ea4c37c57e2af0f3b095be9fcd8bac (diff)
parentcb5850f27c1b4d26957d58e2da2314dd12498671 (diff)
downloademacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.tar.gz
emacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.zip
upstream
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 597beb60ce2..2178df6caf0 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12012-01-19 Glenn Morris <rgm@gnu.org>
2
3 * bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the
4 "skip?" question, since there can be multiple such for any revision.
5
12012-01-14 Eli Zaretskii <eliz@gnu.org> 62012-01-14 Eli Zaretskii <eliz@gnu.org>
2 7
3 * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as 8 * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as