aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-03-01 17:52:03 -0800
committerPaul Eggert2011-03-01 17:52:03 -0800
commitba46f4d85a6938273f52a8cdf7e09d9afee61d7f (patch)
tree606ec46b703532d463ccddf287f0053430eb1f4a /doc/misc/ChangeLog
parentd9d0d182da35312ed0d7a9859b9c6a03994d86d8 (diff)
parent0dc3e4109e0c41bbf5fdcae0ff1156162719693e (diff)
downloademacs-ba46f4d85a6938273f52a8cdf7e09d9afee61d7f.tar.gz
emacs-ba46f4d85a6938273f52a8cdf7e09d9afee61d7f.zip
Merge from mainline.
Diffstat (limited to 'doc/misc/ChangeLog')
-rw-r--r--doc/misc/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6f4f86978da..2ce67bad6cb 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
12011-02-28 Michael Albinus <michael.albinus@gmx.de>
2
3 * tramp.texi (Frequently Asked Questions): Add Emacs 24 to
4 supported systems.
5
62011-02-28 Glenn Morris <rgm@gnu.org>
7
8 * dbus.texi (Type Conversion): Grammar fix.
9
12011-02-23 Michael Albinus <michael.albinus@gmx.de> 102011-02-23 Michael Albinus <michael.albinus@gmx.de>
2 11
3 * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and 12 * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and