Merge from trunk.

[gnu-emacs] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 4e0801f092fbf35f7a30eeb92ca7fb7fa8f78918..abc5c17400ad8a88c7eede9897893dae6c5d0aa2 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,6 +1,6 @@
 /* Calculate what line insertion or deletion to do, and do it
 
-Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2011
+Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2012
   Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.