Skip to content

Commit b3f1476

Browse files
authored
Merge pull request #4 from RougeWare/feature/Licensing
Semantic names for dual licenses
2 parents 0bfec7c + 9caa326 commit b3f1476

File tree

4 files changed

+24
-22
lines changed

4 files changed

+24
-22
lines changed

LICENSE-A.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.
File renamed without changes.

LICENSE-SPECIAL.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright 2020 Ben Leggiero
2+
3+
Permission is hereby granted, free of charge, to entities enumerated in Section
4+
1 of LICENSE.txt, when obtaining a copy of this software and associated
5+
documentation files (the "Software"), to deal in the Software without
6+
restriction, including without limitation the rights to use, copy, modify,
7+
merge, publish, distribute, sublicense, and/or sell copies of the Software, and
8+
to permit persons to whom the Software is furnished to do so, subject to the
9+
following conditions:
10+
11+
The above copyright notice and this permission notice shall be included in all
12+
copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
SOFTWARE.

LICENSE.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
This repository uses multiple licenses. To determine which license is
22
appropriate, use the following guidance:
33

4-
1. The following entities may use the license provided in the LICENSE-A.txt
5-
file in this repository:
4+
1. The following entities may use the license provided in the
5+
LICENSE-SPECIAL.txt file in this repository:
66
a. PKWARE, Inc.
77

8-
2. All other entities must use the license provided in the LICENSE-B.txt file
9-
in this repository.
8+
2. All other entities must use the license provided in the LICENSE-GENERAL.txt
9+
file in this repository.

0 commit comments

Comments
 (0)