diff options
| author | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
| commit | d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e (patch) | |
| tree | 04fa8bc7bd2058a316a7ee30f8741d25bfd0b060 /src/lisp.mk | |
| parent | 2ef26ceb192c7683754cf0b4aa3087f501254332 (diff) | |
| parent | e74aeda863cd6896e06e92586f87b45d63d67d15 (diff) | |
| download | emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.tar.gz emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'src/lisp.mk')
| -rw-r--r-- | src/lisp.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lisp.mk b/src/lisp.mk index 8c2710110e3..174e53ed561 100644 --- a/src/lisp.mk +++ b/src/lisp.mk | |||
| @@ -1,7 +1,7 @@ | |||
| 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-2012 | 3 | ## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2013 Free Software |
| 4 | ## Free Software Foundation, Inc. | 4 | ## Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## This file is part of GNU Emacs. | 6 | ## This file is part of GNU Emacs. |
| 7 | 7 | ||