Skip to content

Commit 72fc14b

Browse files
committed
licence + remove 2do
1 parent edf8528 commit 72fc14b

File tree

4 files changed

+13
-118
lines changed

4 files changed

+13
-118
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ auto_examples
4141
tempCodeRunnerFile.py
4242

4343
#temp files
44-
__temp*.py
44+
__temp*.*
4545

4646
# PyInstaller
4747
# Usually these files are written by a python script from a template

LICENSE

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,16 @@
1-
SAL Software License Agreement
1+
Copyright (c) 2022, Silicon Austria Labs, Magpylib Developers.
2+
All rights reserved.
23

3-
1. Grant of License:
4-
SAL ("Licensor") hereby grants to the authorized user ("Licensee") a non-exclusive, non-transferable license to use the software provided under this Agreement (the "Software") solely for Licensee’s internal business operations.
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions
6+
are met:
57

6-
2. Restrictions:
7-
a. The Licensee shall not, and shall not permit any third parties to, modify, adapt, translate, decompile, reverse engineer, disassemble, attempt to derive the source code of, or create derivative works from the Software.
8-
b. The Licensee shall not sell, redistribute, sublicense, rent, lease, or lend the Software to any third party.
9-
c. The Software may contain confidential information and trade secrets of SAL, and the Licensee agrees to maintain the confidentiality of the Software using at least as great a degree of care as it uses to maintain the confidentiality of its own most confidential information.
8+
1. Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
1010

11-
3. Intellectual Property Rights:
12-
All title, ownership rights, and intellectual property rights in and to the Software shall remain with SAL and/or its suppliers. This Agreement does not transfer any ownership rights in the Software to the Licensee.
11+
2. Redistributions in binary form must reproduce the above
12+
copyright notice, this list of conditions and the following
13+
disclaimer in the documentation and/or other materials provided
14+
with the distribution.
1315

14-
4. Termination:
15-
This License is effective until terminated. The License will terminate immediately without notice from SAL if the Licensee fails to comply with any provision of this Agreement. Upon termination, the Licensee must destroy all copies of the Software.
16-
17-
5. Disclaimer of Warranty:
18-
The Software is provided "AS IS," without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and non-infringement.
19-
20-
6. Limitation of Liability:
21-
In no event shall SAL be liable for any special, incidental, indirect, or consequential damages whatsoever arising out of or related to the use of or inability to use the Software, even if SAL has been advised of the possibility of such damages.
22-
23-
7. General:
24-
This Agreement constitutes the entire agreement between the parties relating to the Software and supersedes all prior or contemporaneous oral or written communications, proposals, and representations with respect to its subject matter.
25-
26-
8. Governing Law:
27-
This Agreement shall be governed by and construed in accordance with the laws of the jurisdiction in which SAL is registered, without regard to its conflict of law provisions.
28-
29-
By using the Software, the Licensee agrees to be bound by the terms of this Agreement.
16+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

TODO.md

Lines changed: 0 additions & 58 deletions
This file was deleted.

UNITS_feeback.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)