aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0345c922a15..56311198831 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
12012-09-12 Michael Albinus <michael.albinus@gmx.de>
2
3 Sync with Tramp 2.2.6.
4
5 * net/tramp.el (tramp-accept-process-output): Don't use
6 JUST-THIS-ONE in the XEmacs case.
7
8 * net/trampver.el: Update release number.
9
12012-09-12 Martin Rudalics <rudalics@gmx.at> 102012-09-12 Martin Rudalics <rudalics@gmx.at>
2 11
3 * emacs-lisp/debug.el (debugger-previous-window-height): New 12 * emacs-lisp/debug.el (debugger-previous-window-height): New