merge master

[gnu-emacs] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 4e746903efc0644926f68c77c75ea424510ce5a0..7023a515571418c78b09025f4c22847cedd4eb85 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,6 +1,7 @@
 /* Buffer manipulation primitives for GNU Emacs.
 
-Copyright (C) 1985-1989, 1993-1995, 1997-2014 Free Software Foundation, Inc.
+Copyright (C) 1985-1989, 1993-1995, 1997-2015 Free Software Foundation,
+Inc.
 
 This file is part of GNU Emacs.