diff options
| author | Stefan Monnier | 2011-01-14 12:18:41 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2011-01-14 12:18:41 -0500 |
| commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
| tree | 258514dac7faab41642d8f319eb113c8a5f09690 /admin/notes/multi-tty | |
| parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
| parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
| download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip | |
Merge from emacs-23
Diffstat (limited to 'admin/notes/multi-tty')
| -rw-r--r-- | admin/notes/multi-tty | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index d7f68930204..1dfc56f7a10 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- coding: utf-8; mode: text; -*- | 1 | -*- coding: utf-8; mode: text; -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | From README.multi-tty in the multi-tty branch. | 6 | From README.multi-tty in the multi-tty branch. |