aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorPaul Eggert2012-01-07 11:51:13 -0800
committerPaul Eggert2012-01-07 11:51:13 -0800
commit9a0115abd18f219f234d6dd460cf7f5ed3c0332f (patch)
tree3ea55596e8d2fbb066b4387d86b509d8f8a1a612 /src/buffer.c
parentdbf17d8b483f08f9506c19ef95e894fca62b8ec7 (diff)
parent6c1bd3f369c39aac648b085c5e9e4e9b42c65c62 (diff)
downloademacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.tar.gz
emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.zip
Merge from trunk.
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 a482493fac7..01418956c8d 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-2011 Free Software Foundation, Inc. 3Copyright (C) 1985-1989, 1993-1995, 1997-2012 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6