Finish the relicensing process (#178)

Closes #64
This commit is contained in:
est31 2018-08-28 11:56:39 +02:00 committed by Pierre Krieger
parent 9853088595
commit fcd0edbdcc
2 changed files with 4 additions and 4 deletions

View file

@ -2,7 +2,7 @@
name = "rodio"
version = "0.8.0"
authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
license = "Apache-2.0"
license = "MIT/Apache-2.0"
description = "Audio playback library"
keywords = ["audio", "playback", "gamedev"]
repository = "https://github.com/tomaka/rodio"

View file

@ -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