Updated licensing

This commit is contained in:
Samer Afach 2017-09-02 21:57:32 +02:00
parent 0bbadd8a40
commit 20f257a368
3 changed files with 16 additions and 3 deletions

13
LICENSE.txt Normal file
View File

@ -0,0 +1,13 @@
This license is the license that determines the terms of using any version of Spintrum up to this one, unless otherwise stated in newer versions.
Spintrum is dual-licensed. You can choose one of the following options:
1. Use Spintrum with the GNU General Public License version 3 (GPLv3) (more information here: https://www.gnu.org/licenses/gpl-3.0.en.html), with an additional clause:
- In case you use Spintrum to produce any work (publication, software, machine, derivative software of any kind, etc...), you are obliged to acknowledge that Spintrum was used in that product.
In case this clause conflicts with other clauses in the GPLv3 license, this clause overwrites any other conflicting terms in the GPLv3 license.
2. As a commercial product: You can contact the authors of Spintrum and describe your requirements for purchasing Spintrum commercially, in which case you receive support and have the option request additional features.
For questions regarding licensing of Spintrum, please contact Samer Afach: [samer [[at]] afach.de].

View File

@ -1 +1 @@
__version__ = "0.2.1"
__version__ = "0.2.2"

View File

@ -19,8 +19,8 @@ const char* get_version()
void print_software_info()
{
std::cout<<"Spintrum version "<<get_version()<<". ";
std::cout<<"This software is provided under the MPL license. "
"For more information, contact Samer Afach: samer@afach.de."<<std::endl<<std::endl;
std::cout<<"This software is provided under a license that should have been delivered with its package in the file LICENSE.txt."
"For more information, contact Samer Afach: samer [[at]] afach.de."<<std::endl<<std::endl;
}
/**