Merge pull request #317 from tgross35/update-licensing

Update licensing to MIT AND (MIT OR Apache-2.0)
rust-lang · Oct 26, 2024 · e4934f1 · e4934f1
2 parents 5603a53 + 4e7ff8b
commit e4934f1
Show file tree

Hide file tree

Showing 5 changed files with 269 additions and 236 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ categories = ["no-std"]
 description = "libm in pure Rust"
 documentation = "https://docs.rs/libm"
 keywords = ["libm", "math"]
-license = "MIT OR Apache-2.0"
+license = "MIT AND (MIT OR Apache-2.0)"
 name = "libm"
 readme = "README.md"
 repository = "https://github.com/rust-lang/libm"

diff --git a/LICENSE-APACHE b/LICENSE-APACHE
diff --git a/LICENSE-MIT b/LICENSE-MIT