License upgrade to GPL version 3 or later

[empserver] / src / scripts / nightly / patches / All / emptime.c.patch

diff --git a/src/scripts/nightly/patches/All/emptime.c.patch b/src/scripts/nightly/patches/All/emptime.c.patch
index db7ed628f34717aa24e037bd6d70d307b7d6ce7a..40fda01329ebb3cc10658d5748af94945f9d2668 100644 (file)
--- a/src/scripts/nightly/patches/All/emptime.c.patch
+++ b/src/scripts/nightly/patches/All/emptime.c.patch
@@ -3,15 +3,15 @@ new file mode 100644
 index 0000000..a83b29d
 --- /dev/null
 +++ b/include/emptime.h
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,40 @@
 +/*
 + *  Empire - A multi-player, client/server Internet based war game.
-+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
-+ *                           Ken Stevens, Steve McClure
++ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
++ *                Ken Stevens, Steve McClure, Markus Armbruster
 + *
-+ *  This program is free software; you can redistribute it and/or modify
++ *  Empire 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 of the License, or
++ *  the Free Software Foundation, either version 3 of the License, or
 + *  (at your option) any later version.
 + *
 + *  This program is distributed in the hope that it will be useful,
@@ -20,8 +20,7 @@ index 0000000..a83b29d
 + *  GNU General Public License for more details.
 + *
 + *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 + *
 + *  ---
 + *
@@ -50,15 +49,15 @@ new file mode 100644
 index 0000000..855de99
 --- /dev/null
 +++ b/src/lib/gen/emptime.c
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,50 @@
 +/*
 + *  Empire - A multi-player, client/server Internet based war game.
-+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
-+ *                           Ken Stevens, Steve McClure
++ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
++ *                Ken Stevens, Steve McClure, Markus Armbruster
 + *
-+ *  This program is free software; you can redistribute it and/or modify
++ *  Empire 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 of the License, or
++ *  the Free Software Foundation, either version 3 of the License, or
 + *  (at your option) any later version.
 + *
 + *  This program is distributed in the hope that it will be useful,
@@ -67,8 +66,7 @@ index 0000000..855de99
 + *  GNU General Public License for more details.
 + *
 + *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 + *
 + *  ---
 + *