Merge from emacs--devo--0

[gnu-emacs] / src / cm.h

diff --git a/src/cm.h b/src/cm.h
index b0d7f2ce84cfb3ef354ccb5b252abf78ec030f5d..36413703a92d545eaf81aa8e84a10d329613720f 100644 (file)
--- a/src/cm.h
+++ b/src/cm.h
@@ -1,12 +1,12 @@
 /* Cursor motion calculation definitions for GNU Emacs
-   Copyright (C) 1985, 1989, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,