diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /src/s/template.h | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/s/template.h')
| -rw-r--r-- | src/s/template.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s/template.h b/src/s/template.h index 4e0400e99e3..527694bd4bb 100644 --- a/src/s/template.h +++ b/src/s/template.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | This file describes the parameters that system description files | 2 | This file describes the parameters that system description files |
| 3 | should define or not. | 3 | should define or not. |
| 4 | 4 | ||
| 5 | Copyright (C) 1985-1986, 1992, 1999, 2001-2011 Free Software Foundation, Inc. | 5 | Copyright (C) 1985-1986, 1992, 1999, 2001-2012 Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | This file is part of GNU Emacs. | 7 | This file is part of GNU Emacs. |
| 8 | 8 | ||