diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-03-16 13:13:10 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-03-16 13:13:10 +0100 |
| commit | 3a80aa7e900c77da7625886f72ee22666ecfae23 (patch) | |
| tree | 5eef5ac02252c1f493908e34c773751987b257b1 /spss/server/readme.inst.txt | |
| parent | 226db2c5c41c149256459bf18dff4585a07e5ea1 (diff) | |
| parent | d69ba86f0855097e46e525794075f3c743e7facb (diff) | |
| download | moa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.tar.gz moa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.tar.bz2 moa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.zip | |
Merge branch 'Branch_MOA-ID-3.2.1' into development_preview
# Conflicts:
# id/server/moa-id-commons/pom.xml
# pom.xml
Diffstat (limited to 'spss/server/readme.inst.txt')
| -rw-r--r-- | spss/server/readme.inst.txt | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/spss/server/readme.inst.txt b/spss/server/readme.inst.txt deleted file mode 100644 index 6cbf14fd0..000000000 --- a/spss/server/readme.inst.txt +++ /dev/null @@ -1,38 +0,0 @@ -Willkommen zur Installation von MOA SP/SS! - -Fuer eine Anleitung zur Installation verwenden Sie bitte das -Installationshandbuch "handbook.html" im Verzeichnis "doc" dieser -Distribution. - -BEVOR SIE STARTEN BEACHTEN SIE BITTE FOLGENDE HINWEISE ZUR -LIZENSIERUNG VON MOA SP/SS SOWIE DER VON IHM VERWENDETEN -BIBLIOTHEKEN: - -This product includes software originally developed at the -Austrian Federal Computing Centre (BRZ - Bundesrechenzentrum, -www.brz.gv.at) and the Federal Chancellery Austria (Stabsstelle -IKT-Strategie des Bundes, Bundeskanzleramt, -www.digitales.oesterreich.gv.at). - -This product includes software developed by third parties -and provided under an open source license (www.opensource.org). - -This product -- up to and including version 1.5.0 -- includes software -"IAIK MOA" provided by Stiftung Secure Information and Communication -Technologies SIC (www.sic.st). This software has been licensed under the terms -and conditions given in "IAIK-LICENSE". - -This product includes software ("IAIK MOA") provided by Stiftung Secure -Information and Communication Technologies SIC (www.sic.st). This software has -been licensed under the terms and conditions given in "SIC-LICENSE.txt". - -License change: -Up to and including version 1.5.0 of this product were published under an -Apache 2.0 license (see "LICENSE-2.0.txt"). From version 1.5.0 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.5.0 a transitional dual license is granted: The -licensee can choose to either use "LICENSE-2.0.txt" together with -"IAIK_LICENSE", or "EUPL v.1.1 - Licence.pdf" together with "SIC-LICENSE.txt" -(for software provided by Stiftung Secure Information and Communication -Technologies SIC).
\ No newline at end of file |