Relicense under dual MIT/Apache-2.0
The Robigalia project wants to include rust-elf. Relicensing at their behest.
This commit is contained in:
parent
51f32fb3df
commit
723532d61d
12
COPYRIGHT
Normal file
12
COPYRIGHT
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
rust-elf is licensed under either of
|
||||||
|
|
||||||
|
* Apache License, Version 2.0 (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.
|
||||||
|
|
||||||
|
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,7 +2,7 @@
|
|||||||
name = "elf"
|
name = "elf"
|
||||||
version = "0.0.5"
|
version = "0.0.5"
|
||||||
authors = ["Christopher Cole <chris.cole.09@gmail.com>"]
|
authors = ["Christopher Cole <chris.cole.09@gmail.com>"]
|
||||||
license = "Apache-2.0"
|
license = "MIT/Apache-2.0"
|
||||||
homepage = "https://github.com/cole14/rust-elf/"
|
homepage = "https://github.com/cole14/rust-elf/"
|
||||||
repository = "https://github.com/cole14/rust-elf/"
|
repository = "https://github.com/cole14/rust-elf/"
|
||||||
documentation = "http://cole14.github.io/rust-elf/"
|
documentation = "http://cole14.github.io/rust-elf/"
|
||||||
|
@ -186,7 +186,7 @@ Apache License
|
|||||||
same "printed page" as the copyright notice for easier
|
same "printed page" as the copyright notice for easier
|
||||||
identification within third-party archives.
|
identification within third-party archives.
|
||||||
|
|
||||||
Copyright {yyyy} {name of copyright owner}
|
Copyright 2016 Christopher Cole
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
25
LICENSE-MIT
Normal file
25
LICENSE-MIT
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
Copyright (c) 2016 Christopher Cole
|
||||||
|
|
||||||
|
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:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice
|
||||||
|
shall be included in all copies or substantial portions
|
||||||
|
of the Software.
|
||||||
|
|
||||||
|
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.
|
Loading…
x
Reference in New Issue
Block a user