Merge from emacs--rel--22

[gnu-emacs] / lisp / play / life.el

diff --git a/lisp/play/life.el b/lisp/play/life.el
index b908a0f14b2d5581a81d510e321d4b34d56ec55f..f1982652941d190d3d9138314835984e9bb7f004 100644 (file)
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -1,7 +1,7 @@
 ;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
 
 ;; Copyright (C) 1988, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Kyle Jones <kyleuunet.uu.net>
 ;; Maintainer: FSF
@@ -11,7 +11,7 @@
 
 ;; 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,