diff options
| author | Glenn Morris | 2011-01-03 20:42:43 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-03 20:42:43 -0800 |
| commit | 3f9b70909a68e40e54f199542065e79df6d6eb04 (patch) | |
| tree | 3c983e884958bfa04ddcf25d5be6f1b478b59935 /src | |
| parent | 37657cbd24db5137d291f865c8367ca1a3ae7096 (diff) | |
| download | emacs-3f9b70909a68e40e54f199542065e79df6d6eb04.tar.gz emacs-3f9b70909a68e40e54f199542065e79df6d6eb04.zip | |
* src/emacs.c (emacs_copyright): Update short copyright year to 2011.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/emacs.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 60982993937..d97f59273cf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-01-04 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs.c (emacs_copyright): Update short copyright year to 2011. | ||
| 4 | |||
| 1 | 2011-01-03 Eli Zaretskii <eliz@gnu.org> | 5 | 2011-01-03 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * image.c (png_jmpbuf): Remove definition. | 7 | * image.c (png_jmpbuf): Remove definition. |
diff --git a/src/emacs.c b/src/emacs.c index 49716c7eb4a..59223336d45 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* Fully extensible Emacs, running on Unix, intended for GNU. | 1 | /* Fully extensible Emacs, running on Unix, intended for GNU. |
| 2 | 2 | ||
| 3 | Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, | 3 | Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, |
| 4 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 5 | Free Software Foundation, Inc. | 5 | Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | This file is part of GNU Emacs. | 7 | This file is part of GNU Emacs. |
| @@ -94,8 +94,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 94 | 94 | ||
| 95 | /* If you change the following line, remember to update | 95 | /* If you change the following line, remember to update |
| 96 | msdos/mainmake.v2 which gleans the Emacs version from it! */ | 96 | msdos/mainmake.v2 which gleans the Emacs version from it! */ |
| 97 | static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc."; | ||
| 98 | static const char emacs_version[] = "24.0.50"; | 97 | static const char emacs_version[] = "24.0.50"; |
| 98 | static const char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc."; | ||
| 99 | 99 | ||
| 100 | /* Make these values available in GDB, which doesn't see macros. */ | 100 | /* Make these values available in GDB, which doesn't see macros. */ |
| 101 | 101 | ||