Skip to content

Commit e5153a9

Browse files
authored
Merge pull request odin-lang#5859 from odin-lang/bill/change-license
Change Odin's LICENSE to zlib from BSD 3-clause
2 parents fd99505 + 4bdce9b commit e5153a9

File tree

108 files changed

+146
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+146
-179
lines changed

LICENSE

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
1-
Copyright (c) 2016-2024 Ginger Bill. All rights reserved.
1+
Copyright (c) 2016-2025 Ginger Bill. All rights reserved.
22

3-
Redistribution and use in source and binary forms, with or without
4-
modification, are permitted provided that the following conditions are met:
3+
This software is provided 'as-is', without any express or implied
4+
warranty. In no event will the authors be held liable for any damages
5+
arising from the use of this software.
56

6-
1. Redistributions of source code must retain the above copyright notice, this
7-
list of conditions and the following disclaimer.
7+
Permission is granted to anyone to use this software for any purpose,
8+
including commercial applications, and to alter it and redistribute it
9+
freely, subject to the following restrictions:
810

9-
2. Redistributions in binary form must reproduce the above copyright notice,
10-
this list of conditions and the following disclaimer in the documentation
11-
and/or other materials provided with the distribution.
12-
13-
3. Neither the name of the copyright holder nor the names of its
14-
contributors may be used to endorse or promote products derived from
15-
this software without specific prior written permission.
16-
17-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
18-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
21-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
23-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
24-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
25-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11+
1. The origin of this software must not be misrepresented; you must not
12+
claim that you wrote the original software. If you use this software
13+
in a product, an acknowledgment in the product documentation would be
14+
appreciated but is not required.
15+
2. Altered source versions must be plainly marked as such, and must not be
16+
misrepresented as being the original software.
17+
3. This notice may not be removed or altered from any source distribution.

base/runtime/dynamic_map_internal.odin

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ _ :: intrinsics
66
// High performance, cache-friendly, open-addressed Robin Hood hashing hash map
77
// data structure with various optimizations for Odin.
88
//
9-
// Copyright 2022 (c) Dale Weiler
10-
//
119
// The core of the hash map data structure is the Raw_Map struct which is a
1210
// type-erased representation of the map. This type-erased representation is
1311
// used in two ways: static and dynamic. When static type information is known,

core/compress/common.odin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package compress
33

44
/*
55
Copyright 2021 Jeroen van Rijn <[email protected]>.
6-
Made available under Odin's BSD-3 license.
6+
Made available under Odin's license.
77
88
List of contributors:
99
Jeroen van Rijn: Initial implementation, optimization.

core/compress/gzip/doc.odin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ package compress_gzip
8282

8383
/*
8484
Copyright 2021 Jeroen van Rijn <[email protected]>.
85-
Made available under Odin's BSD-3 license.
85+
Made available under Odin's license.
8686
8787
List of contributors:
8888
Jeroen van Rijn: Initial implementation.

core/compress/gzip/gzip.odin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package compress_gzip
22

33
/*
44
Copyright 2021 Jeroen van Rijn <[email protected]>.
5-
Made available under Odin's BSD-3 license.
5+
Made available under Odin's license.
66
77
List of contributors:
88
Jeroen van Rijn: Initial implementation.

core/compress/shoco/shoco.odin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package compress_shoco
33

44
/*
55
Copyright 2022 Jeroen van Rijn <[email protected]>.
6-
Made available under Odin's BSD-3 license.
6+
Made available under Odin's license.
77
88
List of contributors:
99
Jeroen van Rijn: Initial implementation.

core/compress/zlib/doc.odin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ package compress_zlib
4444

4545
/*
4646
Copyright 2021 Jeroen van Rijn <[email protected]>.
47-
Made available under Odin's BSD-3 license.
47+
Made available under Odin's license.
4848
4949
List of contributors:
5050
Jeroen van Rijn: Initial implementation.

core/compress/zlib/zlib.odin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package compress_zlib
33

44
/*
55
Copyright 2021 Jeroen van Rijn <[email protected]>.
6-
Made available under Odin's BSD-3 license.
6+
Made available under Odin's license.
77
88
List of contributors:
99
Jeroen van Rijn: Initial implementation, optimization.

core/crypto/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ constant-time byte comparison.
2929

3030
## License
3131

32-
This library is made available under the BSD-3 license.
32+
This library is made available under the zlib license.

core/crypto/_blake2/blake2.odin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package _blake2
22

33
/*
44
Copyright 2021 zhibog
5-
Made available under the BSD-3 license.
5+
Made available under Odin's license.
66
77
List of contributors:
88
zhibog, dotbmp: Initial implementation.

0 commit comments

Comments
 (0)