Merge from trunk.

[gnu-emacs] / src / window.c

diff --git a/src/window.c b/src/window.c
index 8337ede50d1ed13dead6ea3b91f2ede316ea8df4..27e4914ad1a7aa2358b5b5932160d7c0fe077766 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1,6 +1,6 @@
 /* Window creation, deletion and examination for GNU Emacs.
    Does not include redisplay.
-   Copyright (C) 1985-1987, 1993-1998, 2000-2011
+   Copyright (C) 1985-1987, 1993-1998, 2000-2012
                  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.