Merge remote-tracking branch 'upstream/master' into local/yoda-main-1.3.0

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	cosmic-settings/Cargo.toml
This commit is contained in:
Lionel DARNIS 2026-08-19 21:58:13 +02:00
commit 02eccba3f8
62 changed files with 2908 additions and 625 deletions

View file

@ -8,7 +8,7 @@ rust-version = "1.93"
[workspace.dependencies]
cosmic-randr = { path = "../cosmic-randr/lib" }
tokio = { version = "1.49.0", features = ["macros"] }
tokio = { version = "1.53.1", features = ["macros"] }
iced_winit = { path = "/home/lionel/Projets/COSMIC/libcosmic/iced/winit", default-features = false }
image = { version = "0.25.10", default-features = false, features = [
"jpeg",