merge master

[gnu-emacs] / src / window.c

diff --git a/src/window.c b/src/window.c
index b6afa527c68d8d0ea9c20a37a95ce4b1f36bf521..da4e66ca2ebd0af406b82247d8a07ef67ce30be2 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-2014 Free Software
+   Copyright (C) 1985-1987, 1993-1998, 2000-2015 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.