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/dosfns.h | |
| parent | 2ef26ceb192c7683754cf0b4aa3087f501254332 (diff) | |
| parent | e74aeda863cd6896e06e92586f87b45d63d67d15 (diff) | |
| download | emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.tar.gz emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'src/dosfns.h')
| -rw-r--r-- | src/dosfns.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dosfns.h b/src/dosfns.h index 9747c364d71..0bf0ae1f19b 100644 --- a/src/dosfns.h +++ b/src/dosfns.h | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | Coded by Manabu Higashida, 1991. | 2 | Coded by Manabu Higashida, 1991. |
| 3 | Modified by Morten Welinder, 1993-1994. | 3 | Modified by Morten Welinder, 1993-1994. |
| 4 | 4 | ||
| 5 | Copyright (C) 1991, 1994-1995, 1997, 1999, 2001-2012 | 5 | Copyright (C) 1991, 1994-1995, 1997, 1999, 2001-2013 Free Software |
| 6 | Free Software Foundation, Inc. | 6 | Foundation, Inc. |
| 7 | 7 | ||
| 8 | This file is part of GNU Emacs. | 8 | This file is part of GNU Emacs. |
| 9 | 9 | ||