From 6f7c7333b4e7e3c3f26f8757e04acd4a6f6d2d8e Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Mon, 26 Jan 2015 14:35:42 +0100
Subject: [PATCH] Updating license

---
 .../model/naerstadmodel/NaerstadModel.java    | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java b/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java
index 6853634..e284332 100644
--- a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java
+++ b/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java
@@ -620,26 +620,27 @@ public class NaerstadModel extends I18nImpl implements Model{
 
     @Override
     public String getLicense() {
-        return "Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>. \n" +
-            " \n" +
-            " This file is part of VIPS/NaerstadModel \n" +
-            " VIPS/NaerstadModel is free software: you can redistribute it and/or modify\n" +
-            " it under the terms of the GNU Affero General Public License as published by\n" +
-            " the Free Software Foundation, either version 3 of the License, or\n" +
-            " (at your option) any later version.\n" +
-            " \n" +
-            " VIPS/NaerstadModel is distributed in the hope that it will be useful,\n" +
-            " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +
-            " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" +
-            " GNU Affero General Public License for more details.\n" +
-            " \n" +
-            " You should have received a copy of the GNU Affero General Public License\n" +
-            " along with VIPS/NaerstadModel.  If not, see <http://www.gnu.org/licenses/>.";
+        return "\n" +
+            "Copyright (c) 2013-2015 Bioforsk <http://www.bioforsk.no/>. \n" +
+            "\n" +
+            "This file is part of NaerstadModel.\n" +
+            "NaerstadModel is free software: you can redistribute it and/or modify\n" +
+            "it under the terms of the Bioforsk Open Source License as published by \n" +
+            "Bioforsk, either version 1 of the License, or (at your option) any\n" +
+            "later version.\n" +
+            "\n" +
+            "NaerstadModel is distributed in the hope that it will be useful,\n" +
+            "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +
+            "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" +
+            "Bioforsk Open Source License for more details.\n" +
+            "\n" +
+            "You should have received a copy of the Bioforsk Open Source License\n" +
+            "along with NaerstadModel.  If not, see <http://www.bioforsk.no/licenses/>.";
     }
 
     @Override
     public String getCopyright() {
-        return "(c) 2013-2014 Bioforsk (http://www.bioforsk.no/). Contact: post@bioforsk.no";
+        return "(c) 2013-2015 Bioforsk (http://www.bioforsk.no/). Contact: post@bioforsk.no";
     }
 
         
-- 
GitLab