Skip to content

Commit

Permalink
Update license to dual MIT and Apache2. Fixes #160
Browse files Browse the repository at this point in the history
  • Loading branch information
FredrikNoren committed Feb 27, 2023
1 parent b6aceac commit 0d40b39
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 21 deletions.
27 changes: 10 additions & 17 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
MIT License
## License

Copyright (c) 2023 Fredtob Games AB
Licensed under either of

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
at your option.

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 NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
### Contribution

Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
additional terms or conditions.
15 changes: 13 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,17 @@ We welcome community contributions to this project.

Please talk with us on Discord beforehand if you'd like to contribute a larger piece of work.

## License (MIT)
## License

Ambient is licensed under MIT. See the [LICENSE](./LICENSE.md).
Licensed under either of

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

at your option.

### Contribution

Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
additional terms or conditions.
2 changes: 1 addition & 1 deletion guest/rust/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
edition = "2021"
name = "ambient_api"
description = "The API to the Ambient Runtime"
license = "MIT"
license = "MIT OR Apache-2.0"
documentation = "https://docs.rs/ambient_api"
version = { workspace = true }
readme = "../../../README.md"
Expand Down
2 changes: 1 addition & 1 deletion guest/rust/api/api_macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "ambient_api_macros"
version = { workspace = true }
edition = "2021"
description = "Macros for the Ambient API"
license = "MIT"
license = "MIT OR Apache-2.0"
documentation = "https://docs.rs/ambient_api_macros"
repository = "https://github.com/AmbientRun/Ambient"

Expand Down

0 comments on commit 0d40b39

Please sign in to comment.