diff options
| author | Joakim Verona | 2011-02-05 11:23:09 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-02-05 11:23:09 +0100 |
| commit | 4bd51ad5c3445b644dfb017d5b57b10a90aa325f (patch) | |
| tree | 894801e7308ce4ecc34933f959e28f4b9cff9533 /admin/notes/multi-tty | |
| parent | 13cfe8df462ab8da9f0028e16cc84dcaceaca3d1 (diff) | |
| parent | 9bcaafce5351d270ac514e23cb69ff1a5fd35229 (diff) | |
| download | emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.tar.gz emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.zip | |
merge from upstream. currently seems to have bitroted and i get segfaults
Diffstat (limited to 'admin/notes/multi-tty')
| -rw-r--r-- | admin/notes/multi-tty | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index d7f68930204..85babb903b9 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-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. |
| @@ -1360,4 +1360,3 @@ GNU General Public License for more details. | |||
| 1360 | You should have received a copy of the GNU General Public License | 1360 | You should have received a copy of the GNU General Public License |
| 1361 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 1361 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 1362 | 1362 | ||
| 1363 | ;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d | ||