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 /nextstep | |
| parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
| parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
| download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip | |
Merge from emacs-23
Diffstat (limited to 'nextstep')
| -rw-r--r-- | nextstep/ChangeLog | 2 | ||||
| -rw-r--r-- | nextstep/INSTALL | 2 | ||||
| -rw-r--r-- | nextstep/README | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index 26d22b4c90e..84925209c15 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog | |||
| @@ -197,7 +197,7 @@ | |||
| 197 | ;; coding: utf-8 | 197 | ;; coding: utf-8 |
| 198 | ;; End: | 198 | ;; End: |
| 199 | 199 | ||
| 200 | Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. | 200 | Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 201 | 201 | ||
| 202 | This file is part of GNU Emacs. | 202 | This file is part of GNU Emacs. |
| 203 | 203 | ||
diff --git a/nextstep/INSTALL b/nextstep/INSTALL index 5ed9598a754..288dc69d12f 100644 --- a/nextstep/INSTALL +++ b/nextstep/INSTALL | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. | 1 | Copyright (C) 2008, 2009, 2010, 2011 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/nextstep/README b/nextstep/README index 1ff2a4dd921..f80e44b31fb 100644 --- a/nextstep/README +++ b/nextstep/README | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. | 1 | Copyright (C) 2008, 2009, 2010, 2011 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 | This directory contains the files needed to build Emacs on | 4 | This directory contains the files needed to build Emacs on |