Skip to content

Commit 09e7fdb

Browse files
committed
Move to dual license, see gfx-rs#847
1 parent 2c194dc commit 09e7fdb

File tree

12 files changed

+35
-11
lines changed

12 files changed

+35
-11
lines changed

LICENSE renamed to LICENSE-APACHE

File renamed without changes.

LICENSE-MIT

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ If you are looking for information about the released crates (`gfx_core`, `gfx`,
6666

6767
[license]: #license
6868

69-
This repository is currently in the process of being licensed under either of
69+
This repository is licensed under either of
7070

7171
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
7272
* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
7373

74-
at your option. Some parts of the repository are already licensed according to those terms. See the [tracking issue](https://github.com/gfx-rs/gfx/issues/847).
74+
at your option.
7575

7676
## Contributions
7777

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ skip_commits:
1818
files:
1919
- travis.yml
2020
- bors.toml
21-
- LICENSE
21+
- LICENSE-APACHE
22+
- LICENSE-MIT
2223
- '*.md'
2324
- src/backend/metal/*
2425

src/backend/dx11/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "DirectX-11 API backend for gfx-rs"
55
homepage = "https://github.com/gfx-rs/gfx"
66
repository = "https://github.com/gfx-rs/gfx"
77
keywords = ["graphics", "gamedev"]
8-
license = "Apache-2.0"
8+
license = "MIT OR Apache-2.0"
99
authors = ["The Gfx-rs Developers"]
1010
readme = "README.md"
1111
documentation = "https://docs.rs/gfx-backend-dx11"

src/backend/dx12/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "DirectX-12 API backend for gfx-rs"
55
homepage = "https://github.com/gfx-rs/gfx"
66
repository = "https://github.com/gfx-rs/gfx"
77
keywords = ["graphics", "gamedev"]
8-
license = "Apache-2.0"
8+
license = "MIT OR Apache-2.0"
99
authors = ["The Gfx-rs Developers"]
1010
readme = "README.md"
1111
documentation = "https://docs.rs/gfx-backend-dx12"

src/backend/gl/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "OpenGL backend for gfx-rs"
55
homepage = "https://github.com/gfx-rs/gfx"
66
repository = "https://github.com/gfx-rs/gfx"
77
keywords = ["graphics", "gamedev"]
8-
license = "Apache-2.0"
8+
license = "MIT OR Apache-2.0"
99
authors = ["The Gfx-rs Developers"]
1010
readme = "README.md"
1111
documentation = "https://docs.rs/gfx-backend-gl"

src/backend/metal/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "Metal API backend for gfx-rs"
55
homepage = "https://github.com/gfx-rs/gfx"
66
repository = "https://github.com/gfx-rs/gfx"
77
keywords = ["graphics", "gamedev"]
8-
license = "Apache-2.0"
8+
license = "MIT OR Apache-2.0"
99
authors = ["The Gfx-rs Developers"]
1010
readme = "README.md"
1111
documentation = "https://docs.rs/gfx-backend-metal"

src/backend/vulkan/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "Vulkan API backend for gfx-rs"
55
homepage = "https://github.com/gfx-rs/gfx"
66
repository = "https://github.com/gfx-rs/gfx"
77
keywords = ["graphics", "gamedev"]
8-
license = "Apache-2.0"
8+
license = "MIT OR Apache-2.0"
99
authors = ["The Gfx-rs Developers"]
1010
readme = "README.md"
1111
documentation = "https://docs.rs/gfx-device-vulkan"

src/hal/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "gfx-rs hardware abstraction layer"
55
homepage = "https://github.com/gfx-rs/gfx"
66
repository = "https://github.com/gfx-rs/gfx"
77
keywords = ["graphics"]
8-
license = "Apache-2.0"
8+
license = "MIT OR Apache-2.0"
99
authors = ["The Gfx-rs Developers"]
1010
documentation = "https://docs.rs/gfx-hal"
1111
workspace = "../.."

src/render/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "gfx-rs higher rendering layer"
55
homepage = "https://github.com/gfx-rs/gfx"
66
repository = "https://github.com/gfx-rs/gfx"
77
keywords = ["graphics", "gamedev"]
8-
license = "Apache-2.0"
8+
license = "MIT OR Apache-2.0"
99
authors = ["The Gfx-rs Developers"]
1010
readme = "../../README.md"
1111
documentation = "https://docs.rs/gfx-render"

src/warden/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "gfx-rs reftest framework"
55
homepage = "https://github.com/gfx-rs/gfx"
66
repository = "https://github.com/gfx-rs/gfx"
77
keywords = ["graphics", "gamedev"]
8-
license = "Apache-2.0"
8+
license = "MIT OR Apache-2.0"
99
authors = ["The Gfx-rs Developers"]
1010
readme = "../../README.md"
1111
documentation = "https://docs.rs/gfx-render"

0 commit comments

Comments
 (0)