From 9649adf3e56f7035644c41eb1de98f9d270dc869 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 15 Oct 2014 15:22:24 +0200
Subject: [PATCH] Changed License to Bioforsk Open Source License
---
.../model/applescabmodel/AppleScabModel.java | 32 +++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.java b/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.java
index 3521898..66a1da4 100644
--- a/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.java
+++ b/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.java
@@ -614,26 +614,26 @@ public class AppleScabModel extends I18nImpl implements Model{
@Override
public String getLicense() {
- return "Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>. \n" +
- " \n" +
- " This file is part of VIPS/AppleScabModel \n" +
- " VIPS/AppleScabModel 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/AppleScabModel 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/AppleScabModel. If not, see <http://www.gnu.org/licenses/>.";
+ return "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. \n" +
+ "\n" +
+ "This file is part of VIPSLogic. \n" +
+ "VIPSLogic 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" +
+ "VIPSLogic 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" +
+ "" +
+ "You should have received a copy of the Bioforsk Open Source License \n" +
+ "along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. \n";
}
@Override
public String getCopyright() {
- return "(c) 2013 Bioforsk (http://www.bioforsk.no/). Contact: post@bioforsk.no";
+ return "(c) 2014 Bioforsk (http://www.bioforsk.no/). Contact: post@bioforsk.no";
}
--
GitLab