aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-06-20 05:55:06 +0000
committerDan Nicolaescu2007-06-20 05:55:06 +0000
commitb647cd3fd066110b9efb77c66b0dd304eb7ca504 (patch)
tree05ea51b3b494a98b11d7e12cccf4e7bda62804d7
parentfbcfedfe5b79ebc6e9fb0f5b402c5b4b69d41e10 (diff)
downloademacs-b647cd3fd066110b9efb77c66b0dd304eb7ca504.tar.gz
emacs-b647cd3fd066110b9efb77c66b0dd304eb7ca504.zip
* term/xterm.el (terminal-init-xterm): Revert bad merge from trunk.
-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 @@
12007-06-18 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * term/xterm.el (terminal-init-xterm): Revert bad merge from trunk.
4
12007-06-12 Juanma Barranquero <lekktu@gmail.com> 52007-06-12 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * server.el (server-process-filter): Fix typo in docstring. 7 * server.el (server-process-filter): Fix typo in docstring.