diff options
| author | Paul Eggert | 2011-01-14 10:14:17 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-14 10:14:17 -0800 |
| commit | 8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d (patch) | |
| tree | 9aed5489fdfdcf75087bf3d8e50e4f5952c8566c /src/scroll.c | |
| parent | 3720fa2b1ac94b8ac9f193264bcf36990a5f43d2 (diff) | |
| parent | f80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb (diff) | |
| download | emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.tar.gz emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.zip | |
Merge from mainline.
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 e3f02b013ff..b91c7de034e 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 | Copyright (C) 1985, 1986, 1990, 1993, 1994, 2001, 2002, 2003, 2004, | 2 | Copyright (C) 1985, 1986, 1990, 1993, 1994, 2001, 2002, 2003, 2004, |
| 3 | 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||