aboutsummaryrefslogtreecommitdiffstats
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorBastien Guerry2012-10-26 16:42:05 +0200
committerBastien Guerry2012-10-26 16:42:05 +0200
commitbdebdb64b35d6a0a28e04335f4e8e46949206ad3 (patch)
treeea3e0d00bd8da93ae89e86744a80f4e162c5361c /etc/ChangeLog
parentccc83f50a4ca55842bcf955b9f8156c17aa43864 (diff)
downloademacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.tar.gz
emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.zip
Merge upstream Org (from commit acbbe2)
Diffstat (limited to 'etc/ChangeLog')
-rw-r--r--etc/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 3ebe18b407f..60d4a7aa271 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
12012-10-26 Nicolas Goaziou <n.goaziou@gmail.com>
2
3 * refcards/orgcard.tex: Fix keybindings about
4 `org-show-todo-tree'.
5
12012-10-23 Paul Eggert <eggert@cs.ucla.edu> 62012-10-23 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Fix outdated timestamp documentation in Elisp manual (bug#12706). 8 Fix outdated timestamp documentation in Elisp manual (bug#12706).