aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorJohn Wiegley2016-01-11 22:48:07 -0800
committerJohn Wiegley2016-01-11 22:48:07 -0800
commit1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch)
treefc34bd815956a80c35f1e9a0f836a5378bf4b1ed /src/buffer.c
parentc043d9731b499a241830d705e9055c9e42ccf28c (diff)
parentef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff)
downloademacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz
emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.zip
Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes 9c3dbab Fix copyright years by hand 0e96320 Update copyright year to 2016
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c
index ab91aaa4e81..c07b2dc021e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,6 +1,6 @@
1/* Buffer manipulation primitives for GNU Emacs. 1/* Buffer manipulation primitives for GNU Emacs.
2 2
3Copyright (C) 1985-1989, 1993-1995, 1997-2015 Free Software Foundation, 3Copyright (C) 1985-1989, 1993-1995, 1997-2016 Free Software Foundation,
4Inc. 4Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.