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/lisp.mk | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/lisp.mk')
| -rw-r--r-- | src/lisp.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lisp.mk b/src/lisp.mk index 68748b27f28..c082630f717 100644 --- a/src/lisp.mk +++ b/src/lisp.mk | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### lisp.mk --- src/Makefile fragment for GNU Emacs | 1 | ### lisp.mk --- src/Makefile fragment for GNU Emacs |
| 2 | 2 | ||
| 3 | ## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2011 | 3 | ## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2012 |
| 4 | ## Free Software Foundation, Inc. | 4 | ## Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## This file is part of GNU Emacs. | 6 | ## This file is part of GNU Emacs. |