aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58ecb708be..98c7a540e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-11 Michael Albinus <[email protected]>
+
+ * net/tramp.el (tramp-make-temp-file): Backport from Tramp 2.1.
+
2008-06-08 Michael Albinus <[email protected]>
* uniquify.el (uniquify-get-proposed-name): Handle remote files.