diff --git a/Cargo.toml b/Cargo.toml index 9d14ead5..ba8c7bb7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "rodio" version = "0.8.0" authors = ["Pierre Krieger "] -license = "Apache-2.0" +license = "MIT/Apache-2.0" description = "Audio playback library" keywords = ["audio", "playback", "gamedev"] repository = "https://github.com/tomaka/rodio" diff --git a/README.md b/README.md index 5dce7fc0..5ca1dc3a 100644 --- a/README.md +++ b/README.md @@ -18,12 +18,12 @@ Rust playback library. ## License [License]: #license -This repository is currently in the process of being licensed under either of +Licensed under either of -* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0), or * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) -at your option. Some parts of the repository are already licensed according to those terms. Others are licensed Apache License only. For more see [issue 64](https://github.com/tomaka/rodio/issues/64). +at your option. ### License of your contributions