Merge pull request amethyst#2709 from remilauzier/main

Update license field
lacc97 · Aug 16, 2021 · de9bad7 · de9bad7
2 parents bc0f821 + 20fbad5
commit de9bad7
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
 
 readme = "README.md"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 autoexamples = false # Our examples come with their own Cargo.toml and are in the [workspace] section
 

diff --git a/amethyst_animation/Cargo.toml b/amethyst_animation/Cargo.toml
@@ -14,7 +14,7 @@ homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
 
 readme = "README.md"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 amethyst_assets = { path = "../amethyst_assets", version = "0.16.0" }

diff --git a/amethyst_assets/Cargo.toml b/amethyst_assets/Cargo.toml
@@ -11,7 +11,7 @@ description = """
 Asynchronous asset management for games.
 """
 exclude = ["examples/*"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 keywords = ["game", "asset", "resource", "management", "amethyst"]
 categories = ["filesystem"]
 

diff --git a/amethyst_audio/Cargo.toml b/amethyst_audio/Cargo.toml
@@ -16,7 +16,7 @@ homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
 
 readme = "README.md"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 amethyst_assets = { path = "../amethyst_assets", version = "0.16.0" }

diff --git a/amethyst_config/Cargo.toml b/amethyst_config/Cargo.toml
@@ -13,7 +13,7 @@ documentation = "https://docs.amethyst.rs/stable/amethyst_config/"
 homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
 
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 ron = "0.6.4"

diff --git a/amethyst_controls/Cargo.toml b/amethyst_controls/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.amethyst.rs/stable/amethyst_controls/"
 homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
 
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 amethyst_core = { path = "../amethyst_core", version = "0.16.0" }

diff --git a/amethyst_core/Cargo.toml b/amethyst_core/Cargo.toml
@@ -13,7 +13,7 @@ documentation = "https://docs.amethyst.rs/stable/amethyst_core/"
 homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
 
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 amethyst_error = { path = "../amethyst_error", version = "0.16.0" }

diff --git a/amethyst_derive/Cargo.toml b/amethyst_derive/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.amethyst.rs/stable/amethyst_derive/"
 homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
 
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 # FIXME: remove after legion port
 autotests = false

diff --git a/amethyst_error/Cargo.toml b/amethyst_error/Cargo.toml
@@ -12,7 +12,7 @@ Internal error handling for Amethyst.
 """
 keywords = ["game", "error", "amethyst"]
 categories = ["rust-patterns"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 documentation = "https://docs.amethyst.rs/stable/amethyst_error/"
 homepage = "https://amethyst.rs/"

diff --git a/amethyst_gltf/Cargo.toml b/amethyst_gltf/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.amethyst.rs/stable/amethyst_gltf/"
 homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
 
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 amethyst_assets = { path = "../amethyst_assets", version = "0.16.0" }

diff --git a/amethyst_input/Cargo.toml b/amethyst_input/Cargo.toml
@@ -13,7 +13,7 @@ documentation = "https://docs.amethyst.rs/stable/amethyst_input/"
 homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
 
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 amethyst_core = { path = "../amethyst_core", version = "0.16.0" }

diff --git a/amethyst_locale/Cargo.toml b/amethyst_locale/Cargo.toml
@@ -11,7 +11,7 @@ description = """
 Localisation bindings.
 """
 exclude = ["examples/*"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 keywords = ["game", "localisation", "resource", "management", "amethyst"]
 categories = ["localization"]
 

diff --git a/amethyst_network/Cargo.toml b/amethyst_network/Cargo.toml
@@ -17,7 +17,7 @@ readme = "README.md"
 documentation = "https://docs.amethyst.rs/stable/amethyst_network/index.html"
 homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [features]
 profiler = ["thread_profiler/thread_profiler"]

diff --git a/amethyst_rendy/Cargo.toml b/amethyst_rendy/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 description = "High-level rendering engine with multiple backends"
 keywords = ["game", "engine", "renderer", "3d", "amethyst"]
 categories = ["rendering", "rendering::engine"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [package.metadata.docs.rs]
 features = ["shader-compiler", "test-support", "winit", "vulkan"]

diff --git a/amethyst_test/Cargo.toml b/amethyst_test/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["game-engines"]
 documentation = "https://docs.amethyst.rs/stable/amethyst_test/"
 homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 amethyst = { path = "..", version = "0.16.0", default-features = false }

diff --git a/amethyst_tiles/Cargo.toml b/amethyst_tiles/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.amethyst.rs/master/amethyst_tiles/"
 homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
 
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [badges]
 appveyor = { repository = "amethyst/amethyst" }

diff --git a/amethyst_ui/Cargo.toml b/amethyst_ui/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["game-engines"]
 documentation = "https://docs.amethyst.rs/stable/amethyst_ui/"
 homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 amethyst_assets = { path = "../amethyst_assets", version = "0.16.0" }

diff --git a/amethyst_utils/Cargo.toml b/amethyst_utils/Cargo.toml
@@ -13,7 +13,7 @@ documentation = "https://docs.amethyst.rs/stable/amethyst_utils/"
 homepage = "https://amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
 
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 amethyst_assets = { path = "../amethyst_assets", version = "0.16.0" }

diff --git a/amethyst_window/Cargo.toml b/amethyst_window/Cargo.toml
@@ -10,7 +10,7 @@ description = "Windowing support for Amethyst engine."
 documentation = "https://www.amethyst.rs/doc/latest/doc/amethyst_window/"
 homepage = "https://www.amethyst.rs/"
 repository = "https://github.com/amethyst/amethyst"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 amethyst_core = { path = "../amethyst_core", version = "0.16.0" }