summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog.multi-tty4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog.multi-tty b/lisp/ChangeLog.multi-tty
index 5fe8ab51c50..0d89f9d15ca 100644
--- a/lisp/ChangeLog.multi-tty
+++ b/lisp/ChangeLog.multi-tty
@@ -1,3 +1,7 @@
+2007-06-18 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * term/xterm.el (terminal-init-xterm): Revert bad merge from trunk.
+
2007-06-12 Juanma Barranquero <lekktu@gmail.com>
* server.el (server-process-filter): Fix typo in docstring.