Mercurial > emacs
diff admin/notes/copyright @ 112327:17e0028efc29
Merge from mainline.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Fri, 14 Jan 2011 10:14:17 -0800 |
parents | a4a6f5f8f078 417b1e4d63cd |
children |
line wrap: on
line diff
--- a/admin/notes/copyright Thu Jan 13 21:07:26 2011 -0800 +++ b/admin/notes/copyright Fri Jan 14 10:14:17 2011 -0800 @@ -1,4 +1,4 @@ -Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. See the end of the file for license conditions.