From 0899b904c044410cab09ce6d696da061b7e9f991 Mon Sep 17 00:00:00 2001 From: Andrea Frigido Date: Thu, 20 Jul 2023 18:29:49 +0100 Subject: [PATCH] Update license field following SPDX 2.1 license expression standard --- imgui-examples/Cargo.toml | 2 +- imgui-glium-renderer/Cargo.toml | 2 +- imgui-glow-renderer/Cargo.toml | 2 +- imgui-sdl2-support/Cargo.toml | 2 +- imgui-sys/Cargo.toml | 2 +- imgui-winit-glow-renderer-viewports/Cargo.toml | 2 +- imgui-winit-support/Cargo.toml | 2 +- imgui/Cargo.toml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/imgui-examples/Cargo.toml b/imgui-examples/Cargo.toml index ca92951dd..a4bec547c 100644 --- a/imgui-examples/Cargo.toml +++ b/imgui-examples/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" description = "imgui crate examples using Glium backend" homepage = "https://github.com/imgui-rs/imgui-rs" repository = "https://github.com/imgui-rs/imgui-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" publish = false [dev-dependencies] diff --git a/imgui-glium-renderer/Cargo.toml b/imgui-glium-renderer/Cargo.toml index d3aac51e3..c5af40fb7 100644 --- a/imgui-glium-renderer/Cargo.toml +++ b/imgui-glium-renderer/Cargo.toml @@ -6,7 +6,7 @@ description = "Glium renderer for the imgui crate" homepage = "https://github.com/imgui-rs/imgui-rs" repository = "https://github.com/imgui-rs/imgui-rs" documentation = "https://docs.rs/imgui-glium-renderer" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" categories = ["gui", "rendering"] [dependencies] diff --git a/imgui-glow-renderer/Cargo.toml b/imgui-glow-renderer/Cargo.toml index 4a88fab2d..77d684eb7 100644 --- a/imgui-glow-renderer/Cargo.toml +++ b/imgui-glow-renderer/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" description = "glow renderer for the imgui crate" homepage = "https://github.com/imgui-rs/imgui-rs" repository = "https://github.com/imgui-rs/imgui-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" categories = ["gui", "rendering"] [dependencies] diff --git a/imgui-sdl2-support/Cargo.toml b/imgui-sdl2-support/Cargo.toml index 2c860ab1d..b9e67e4b1 100644 --- a/imgui-sdl2-support/Cargo.toml +++ b/imgui-sdl2-support/Cargo.toml @@ -7,7 +7,7 @@ description = "sdl2 support code for the imgui crate" homepage = "https://github.com/imgui-rs/imgui-rs" repository = "https://github.com/imgui-rs/imgui-rs" documentation = "https://docs.rs/imgui-sdl2-support" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" categories = ["gui"] [dependencies] diff --git a/imgui-sys/Cargo.toml b/imgui-sys/Cargo.toml index 12fe0a33d..f3346fccb 100644 --- a/imgui-sys/Cargo.toml +++ b/imgui-sys/Cargo.toml @@ -6,7 +6,7 @@ description = "Raw FFI bindings to dear imgui" homepage = "https://github.com/imgui-rs/imgui-rs" repository = "https://github.com/imgui-rs/imgui-rs" documentation = "https://docs.rs/imgui-sys" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" categories = ["gui", "external-ffi-bindings"] build = "build.rs" links = "imgui" diff --git a/imgui-winit-glow-renderer-viewports/Cargo.toml b/imgui-winit-glow-renderer-viewports/Cargo.toml index be6a32439..aea70cdf1 100644 --- a/imgui-winit-glow-renderer-viewports/Cargo.toml +++ b/imgui-winit-glow-renderer-viewports/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" description = "combined platform + renderer using the docking branch viewport feature" homepage = "https://github.com/imgui-rs/imgui-rs" repository = "https://github.com/imgui-rs/imgui-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/imgui-winit-support/Cargo.toml b/imgui-winit-support/Cargo.toml index 39e04ee78..598209584 100644 --- a/imgui-winit-support/Cargo.toml +++ b/imgui-winit-support/Cargo.toml @@ -6,7 +6,7 @@ description = "winit support code for the imgui crate" homepage = "https://github.com/imgui-rs/imgui-rs" repository = "https://github.com/imgui-rs/imgui-rs" documentation = "https://docs.rs/imgui-winit-support" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" categories = ["gui"] [dependencies] diff --git a/imgui/Cargo.toml b/imgui/Cargo.toml index 0e1586d45..55d9fb1d6 100644 --- a/imgui/Cargo.toml +++ b/imgui/Cargo.toml @@ -6,7 +6,7 @@ description = "High-level Rust bindings to dear imgui" homepage = "https://github.com/imgui-rs/imgui-rs" repository = "https://github.com/imgui-rs/imgui-rs" documentation = "https://docs.rs/imgui" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" categories = ["gui", "api-bindings"] readme = "../README.markdown"