diff options
| author | Paul Eggert | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/buffer.h | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/buffer.h b/src/buffer.h index cdc5fba58a8..570d7f1a64e 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* Header file for the buffer manipulation primitives. | 1 | /* Header file for the buffer manipulation primitives. |
| 2 | Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, | 2 | |
| 3 | 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 3 | Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, |
| 4 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | ||
| 4 | Free Software Foundation, Inc. | 5 | Free Software Foundation, Inc. |
| 5 | 6 | ||
| 6 | This file is part of GNU Emacs. | 7 | This file is part of GNU Emacs. |