diff options
| author | Paul Eggert | 2012-01-07 11:51:13 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-07 11:51:13 -0800 |
| commit | 9a0115abd18f219f234d6dd460cf7f5ed3c0332f (patch) | |
| tree | 3ea55596e8d2fbb066b4387d86b509d8f8a1a612 /src/scroll.c | |
| parent | dbf17d8b483f08f9506c19ef95e894fca62b8ec7 (diff) | |
| parent | 6c1bd3f369c39aac648b085c5e9e4e9b42c65c62 (diff) | |
| download | emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.tar.gz emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.zip | |
Merge from trunk.
Diffstat (limited to 'src/scroll.c')
| -rw-r--r-- | src/scroll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scroll.c b/src/scroll.c index 05f6fdf85f0..77ea1007ade 100644 --- a/src/scroll.c +++ b/src/scroll.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Calculate what line insertion or deletion to do, and do it | 1 | /* Calculate what line insertion or deletion to do, and do it |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2011 | 3 | Copyright (C) 1985-1986, 1990, 1993-1994, 2001-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. |