Merge from emacs-23

[gnu-emacs] / src / fringe.c

diff --git a/src/fringe.c b/src/fringe.c
index fce100b1463dee136bb3eb11295007958da153f4..45d6ecfa4b719a26645f7f94aaf04ceb94268693 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1,7 +1,7 @@
 /* Fringe handling (split from xdisp.c).
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997,
                  1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+                 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.