summaryrefslogtreecommitdiff
path: root/NOTICE.txt
diff options
context:
space:
mode:
authortkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-06-22 14:30:14 (GMT)
committertkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-06-22 14:30:14 (GMT)
commitea1407ba9756252666e5d67f2397d7cb44ba0232 (patch)
treed3bfd53ed6e8169e9b4888b65b2547df509193ae /NOTICE.txt
parentf0245892bcc4a5e4bf639b8fa258c4a39f6316e5 (diff)
downloadmocca-ea1407ba9756252666e5d67f2397d7cb44ba0232.zip
mocca-ea1407ba9756252666e5d67f2397d7cb44ba0232.tar.gz
mocca-ea1407ba9756252666e5d67f2397d7cb44ba0232.tar.bz2
License change
copyright headers changed/added License text added NOTICE modified git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@940 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'NOTICE.txt')
-rw-r--r--NOTICE.txt19
1 files changed, 17 insertions, 2 deletions
diff --git a/NOTICE.txt b/NOTICE.txt
index 2f25af7..7bfdf4b 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,6 +1,11 @@
MOCCA Project
Copyright 2008 Federal Chancellery Austria and Graz University of Technology
+This "NOTICE" text file is part of the distribution. Any derivative works that
+you distribute must include a readable copy of the attribution notices contained
+within this NOTICE file, excluding those notices that do not pertain to any part
+of the derivative works.
+
This product includes software developed at
E-Government Innovation Center (www.egiz.gv.at).
@@ -8,10 +13,20 @@ E-Government Innovation Center is a joint initiative of
Federal Chancellery Austria and Graz University of Technology.
-This product includes software developed by third parties
-and provided under an open source license (www.opensource.org).
+This product includes software developed by
+by third parties and provided under an open source license (www.opensource.org).
This product includes software provided by
Stiftung Secure Information and Communication Technologies SIC
(www.sic.st).
+
+License change:
+Up to and including version 1.3.6 of this product were published under an
+Apache 2.0 license (see "LICENSE-2.0.txt"). From version 1.3.6 onwards the
+product is licensed under the terms and conditions of the European Union Public
+Licence (EUPL) Version 1.1 ("EUPL v.1.1 - Licence.pdf").
+For this present version 1.3.6 a transitional dual license is granted: The
+licensee can choose to either use "LICENSE-2.0.txt" or
+"EUPL v.1.1 - Licence.pdf" together with "SIC-LICENSE.txt" (for software
+provided by Stiftung Secure Information and Communication Technologies SIC).