aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2014-06-21 12:45:59 -0700
committerGlenn Morris2014-06-21 12:45:59 -0700
commitc400516ab1d827d08225ffb3e1bc1969c73cc45e (patch)
treeb16343b9e11c916c96b12ab56b6024cad91d3aff /doc/misc/ChangeLog
parent539ad293eb36b4cf458cbdb5a6b37f5cd1bb68a1 (diff)
parent8047f439ec7d0bbe0085800a13bee8da883ae4dd (diff)
downloademacs-c400516ab1d827d08225ffb3e1bc1969c73cc45e.tar.gz
emacs-c400516ab1d827d08225ffb3e1bc1969c73cc45e.zip
Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.ca
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 a6ddb15496d..a1a99e5fd06 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
12014-06-21 Eli Zaretskii <eliz@gnu.org>
2
3 * autotype.texi (Skeleton Language): Document the feature of \n
4 when at eol.
5
62014-06-21 Michael Albinus <michael.albinus@gmx.de>
7
8 * dbus.texi (Type Conversion): Formatting edits in example.
9
12014-06-15 Michael Albinus <michael.albinus@gmx.de> 102014-06-15 Michael Albinus <michael.albinus@gmx.de>
2 11
3 Sync with Tramp 2.2.10. 12 Sync with Tramp 2.2.10.