From 20f257a36873c1027856268ed3a061ac06c83869 Mon Sep 17 00:00:00 2001 From: Samer Afach Date: Sat, 2 Sep 2017 21:57:32 +0200 Subject: [PATCH] Updated licensing --- LICENSE.txt | 13 +++++++++++++ spintrum/meta.py | 2 +- src/Spintrum.cpp | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d00353c --- /dev/null +++ b/LICENSE.txt @@ -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]. \ No newline at end of file diff --git a/spintrum/meta.py b/spintrum/meta.py index 3ced358..b5fdc75 100644 --- a/spintrum/meta.py +++ b/spintrum/meta.py @@ -1 +1 @@ -__version__ = "0.2.1" +__version__ = "0.2.2" diff --git a/src/Spintrum.cpp b/src/Spintrum.cpp index adfbc45..303a160 100644 --- a/src/Spintrum.cpp +++ b/src/Spintrum.cpp @@ -19,8 +19,8 @@ const char* get_version() void print_software_info() { std::cout<<"Spintrum version "<