diff options
| author | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
| commit | 678fb7066698ebfe3aecba722294025ed26da01b (patch) | |
| tree | 951ac3055141d950974051d13c10e5d7c6a98e31 /admin/notes | |
| parent | 71784361eb381ec2b12bd8283724a7addec49079 (diff) | |
| parent | 959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff) | |
| download | emacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip | |
merge trunk
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/copyright | 2 | ||||
| -rw-r--r-- | admin/notes/font-backend | 2 | ||||
| -rw-r--r-- | admin/notes/lel-TODO | 2 | ||||
| -rw-r--r-- | admin/notes/multi-tty | 4 | ||||
| -rw-r--r-- | admin/notes/unicode | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright index 0ad99900779..72b7d7e2d23 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2007-2011 Free Software Foundation, Inc. | 1 | Copyright (C) 2007-2012 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
diff --git a/admin/notes/font-backend b/admin/notes/font-backend index d51d3ec1c3b..ec2dc11345b 100644 --- a/admin/notes/font-backend +++ b/admin/notes/font-backend | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2002-2011 Free Software Foundation, Inc. | 1 | Copyright (C) 2002-2012 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
diff --git a/admin/notes/lel-TODO b/admin/notes/lel-TODO index c03d0f6fdfb..065a10f20e4 100644 --- a/admin/notes/lel-TODO +++ b/admin/notes/lel-TODO | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Some lisp/emacs-lisp/ Features and Where They Are Documented | 1 | Some lisp/emacs-lisp/ Features and Where They Are Documented |
| 2 | 2 | ||
| 3 | Copyright (C) 2007-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 2007-2012 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 | 6 | ||
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 8a10997eb8b..4146c8ffa58 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-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 2007-2012 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. |
| @@ -789,7 +789,7 @@ DIARY OF CHANGES | |||
| 789 | frame's kboard from there.) | 789 | frame's kboard from there.) |
| 790 | 790 | ||
| 791 | -- Fix rif issue with X-tty combo sessions. IMHO the best thing to do | 791 | -- Fix rif issue with X-tty combo sessions. IMHO the best thing to do |
| 792 | is to get rid of that global variable (and use the value value in | 792 | is to get rid of that global variable (and use the value in |
| 793 | display_method, which is guaranteed to be correct). | 793 | display_method, which is guaranteed to be correct). |
| 794 | 794 | ||
| 795 | (Done, did exactly that. Core dumps during combo sessions became | 795 | (Done, did exactly that. Core dumps during combo sessions became |
diff --git a/admin/notes/unicode b/admin/notes/unicode index ce7d3732f03..382e3ee0f9f 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*-mode: text; coding: latin-1;-*- | 1 | -*-mode: text; coding: latin-1;-*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2002-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 2002-2012 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 | Problems, fixmes and other unicode-related issues | 6 | Problems, fixmes and other unicode-related issues |