[fondue-commits] [SCM] Fondue Font Editor branch, master, updated. 85629e3525a0e05a6d0483583269332ac45554ed

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit eec5d35b2334d3c504a4ff7f2bdad234d9ca9de0
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Thu Feb 28 21:40:39 2008 +0100

    relicense under GPLv3 (*.xml, *.xls, *.awk)

diff --git a/data/instructions.xml b/data/instructions.xml
index 36a97d5..a8e405d 100644
--- a/data/instructions.xml
+++ b/data/instructions.xml
@@ -2,9 +2,9 @@
 <!--
 	Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
 
-	This program is free software; you can redistribute it and/or modify
+	This program 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,
@@ -13,8 +13,7 @@
 	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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <!-- WARNING: content must be sorted! -->
 <instructions>
diff --git a/gui/instnames.xsl b/gui/instnames.xsl
index e4ed3cb..1ae37a7 100644
--- a/gui/instnames.xsl
+++ b/gui/instnames.xsl
@@ -2,9 +2,9 @@
 <!--
 	Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
 
-	This program is free software; you can redistribute it and/or modify
+	This program 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,
@@ -13,8 +13,7 @@
 	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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
diff --git a/nongui/decodertable.xsl b/nongui/decodertable.xsl
index 1a0f2a1..f1debf9 100644
--- a/nongui/decodertable.xsl
+++ b/nongui/decodertable.xsl
@@ -2,9 +2,9 @@
 <!--
 	Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
 
-	This program is free software; you can redistribute it and/or modify
+	This program 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,
@@ -13,8 +13,7 @@
 	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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
diff --git a/nongui/encodertable.xsl b/nongui/encodertable.xsl
index c0edb11..70d614b 100644
--- a/nongui/encodertable.xsl
+++ b/nongui/encodertable.xsl
@@ -2,9 +2,9 @@
 <!--
 	Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
 
-	This program is free software; you can redistribute it and/or modify
+	This program 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,
@@ -13,8 +13,7 @@
 	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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
diff --git a/nongui/unicodenameslist.awk b/nongui/unicodenameslist.awk
index 538c77b..7ca097b 100644
--- a/nongui/unicodenameslist.awk
+++ b/nongui/unicodenameslist.awk
@@ -1,8 +1,8 @@
 # Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program 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,
@@ -11,8 +11,7 @@
 # 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 BEGIN {
 	FS="\t"

-- 
Fondue Font Editor