Skip to content
Snippets Groups Projects
Commit 6f7c7333 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Updating license

parent 1da6f35a
No related branches found
No related tags found
No related merge requests found
...@@ -620,26 +620,27 @@ public class NaerstadModel extends I18nImpl implements Model{ ...@@ -620,26 +620,27 @@ public class NaerstadModel extends I18nImpl implements Model{
@Override @Override
public String getLicense() { public String getLicense() {
return "Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>. \n" + return "\n" +
" \n" + "Copyright (c) 2013-2015 Bioforsk <http://www.bioforsk.no/>. \n" +
" This file is part of VIPS/NaerstadModel \n" + "\n" +
" VIPS/NaerstadModel is free software: you can redistribute it and/or modify\n" + "This file is part of NaerstadModel.\n" +
" it under the terms of the GNU Affero General Public License as published by\n" + "NaerstadModel is free software: you can redistribute it and/or modify\n" +
" the Free Software Foundation, either version 3 of the License, or\n" + "it under the terms of the Bioforsk Open Source License as published by \n" +
" (at your option) any later version.\n" + "Bioforsk, either version 1 of the License, or (at your option) any\n" +
" \n" + "later version.\n" +
" VIPS/NaerstadModel is distributed in the hope that it will be useful,\n" + "\n" +
" but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "NaerstadModel is distributed in the hope that it will be useful,\n" +
" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +
" GNU Affero General Public License for more details.\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +
" \n" + "Bioforsk Open Source License for more details.\n" +
" You should have received a copy of the GNU Affero General Public License\n" + "\n" +
" along with VIPS/NaerstadModel. If not, see <http://www.gnu.org/licenses/>."; "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 @Override
public String getCopyright() { 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";
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment