aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/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 /doc/misc/ChangeLog
parentccc83f50a4ca55842bcf955b9f8156c17aa43864 (diff)
downloademacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.tar.gz
emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.zip
Merge upstream Org (from commit acbbe2)
Diffstat (limited to 'doc/misc/ChangeLog')
-rw-r--r--doc/misc/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index fc44828e8bf..a0cfd675f0a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
12012-10-26 Bastien Guerry <bzg@gnu.org>
2
3 * org.texi (Installation): Update the link to Org's ELPA. Also
4 don't mention org-install.el anymore as the replacement file
5 org-loaddefs.el is now loaded by org.el.
6
12012-10-25 Michael Albinus <michael.albinus@gmx.de> 72012-10-25 Michael Albinus <michael.albinus@gmx.de>
2 8
3 * tramp.texi (Frequently Asked Questions): Mention 9 * tramp.texi (Frequently Asked Questions): Mention