started lizenz changes
authorOliver Maurhart <oliver.maurhart@ait.ac.at>
Wed, 29 Oct 2014 15:02:42 +0100
changeset 239bfac95f9ac41
parent 238 d33edf5c2717
child 240 d7ef04254e9c
started lizenz changes
OpenSecurity.iss
OpenSecurity/Lizenz.txt
OpenSecurity/bin/__init__.py
     1.1 --- a/OpenSecurity.iss	Tue Oct 28 15:20:42 2014 +0100
     1.2 +++ b/OpenSecurity.iss	Wed Oct 29 15:02:42 2014 +0100
     1.3 @@ -2,6 +2,36 @@
     1.4  ; OpenSecurity setup file for use with
     1.5  ; Inno Setup Compiler (http://www.jrsoftware.org/isinfo.php) 
     1.6  
     1.7 +;                         OpenSecurity
     1.8 +;                         ============
     1.9 +; 
    1.10 +; Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
    1.11 +; 
    1.12 +; 
    1.13 +;     X-Net Technologies GmbH
    1.14 +;     Elisabethstrasse 1
    1.15 +;     4020 Linz
    1.16 +;     AUSTRIA
    1.17 +; 
    1.18 +;     AIT Austrian Institute of Technology
    1.19 +;     Donau City Strasse 1
    1.20 +;     1220 Wien
    1.21 +;     AUSTRIA
    1.22 +; 
    1.23 +; 
    1.24 +; Licensed under the Apache License, Version 2.0 (the "License");
    1.25 +; you may not use this file except in compliance with the License.
    1.26 +; You may obtain a copy of the License at
    1.27 +; 
    1.28 +;    http://www.apache.org/licenses/LICENSE-2.0
    1.29 +; 
    1.30 +; Unless required by applicable law or agreed to in writing, software
    1.31 +; distributed under the License is distributed on an "AS IS" BASIS,
    1.32 +; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    1.33 +; See the License for the specific language governing permissions and
    1.34 +; limitations under the License.
    1.35 +
    1.36 +
    1.37  [Setup]
    1.38  AppName=OpenSecurity
    1.39  AppContact=AIT Austrian Institute of Technology
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/OpenSecurity/Lizenz.txt	Wed Oct 29 15:02:42 2014 +0100
     2.3 @@ -0,0 +1,30 @@
     2.4 +                        OpenSecurity
     2.5 +                        ============
     2.6 +
     2.7 +Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
     2.8 +
     2.9 +
    2.10 +    X-Net Services GmbH
    2.11 +    Elisabethstrasse 1
    2.12 +    4020 Linz
    2.13 +    AUSTRIA
    2.14 +    https://www.x-net.at
    2.15 +
    2.16 +    AIT Austrian Institute of Technology
    2.17 +    Donau City Strasse 1
    2.18 +    1220 Wien
    2.19 +    AUSTRIA
    2.20 +    http://www.ait.ac.at
    2.21 +
    2.22 +
    2.23 +Licensed under the Apache License, Version 2.0 (the "License");
    2.24 +you may not use this file except in compliance with the License.
    2.25 +You may obtain a copy of the License at
    2.26 +
    2.27 +   http://www.apache.org/licenses/LICENSE-2.0
    2.28 +
    2.29 +Unless required by applicable law or agreed to in writing, software
    2.30 +distributed under the License is distributed on an "AS IS" BASIS,
    2.31 +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    2.32 +See the License for the specific language governing permissions and
    2.33 +limitations under the License.
     3.1 --- a/OpenSecurity/bin/__init__.py	Tue Oct 28 15:20:42 2014 +0100
     3.2 +++ b/OpenSecurity/bin/__init__.py	Wed Oct 29 15:02:42 2014 +0100
     3.3 @@ -7,27 +7,35 @@
     3.4  # Autor: Mihai Bartha, <mihai.bartha@ait.ac.at>
     3.5  #        Oliver Maurhart, <oliver.maurhart@ait.ac.at>
     3.6  #
     3.7 -# Copyright (C) 2013 AIT Austrian Institute of Technology
     3.8 -# AIT Austrian Institute of Technology GmbH
     3.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
    3.10 -# http://www.ait.ac.at
    3.11 -#
    3.12 -# This program is free software; you can redistribute it and/or
    3.13 -# modify it under the terms of the GNU General Public License
    3.14 -# as published by the Free Software Foundation version 2.
    3.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
    3.16  # 
    3.17 -# This program is distributed in the hope that it will be useful,
    3.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
    3.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    3.20 -# GNU General Public License for more details.
    3.21  # 
    3.22 -# You should have received a copy of the GNU General Public License
    3.23 -# along with this program; if not, write to the Free Software
    3.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor, 
    3.25 -# Boston, MA  02110-1301, USA.
    3.26 +#     X-Net Technologies GmbH
    3.27 +#     Elisabethstrasse 1
    3.28 +#     4020 Linz
    3.29 +#     AUSTRIA
    3.30 +#     https://www.x-net.at
    3.31 +# 
    3.32 +#     AIT Austrian Institute of Technology
    3.33 +#     Donau City Strasse 1
    3.34 +#     1220 Wien
    3.35 +#     AUSTRIA
    3.36 +#     http://www.ait.ac.at
    3.37 +# 
    3.38 +# 
    3.39 +# Licensed under the Apache License, Version 2.0 (the "License");
    3.40 +# you may not use this file except in compliance with the License.
    3.41 +# You may obtain a copy of the License at
    3.42 +# 
    3.43 +#    http://www.apache.org/licenses/LICENSE-2.0
    3.44 +# 
    3.45 +# Unless required by applicable law or agreed to in writing, software
    3.46 +# distributed under the License is distributed on an "AS IS" BASIS,
    3.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    3.48 +# See the License for the specific language governing permissions and
    3.49 +# limitations under the License.
    3.50  # ------------------------------------------------------------
    3.51  
    3.52 -
    3.53  # public modules
    3.54  __all__ = []
    3.55