merge: upstream/master vers epoch-1.8.0
# Conflicts: # iced # src/surface/action.rs # src/surface/mod.rs # src/widget/text_input/input.rs # src/widget/toaster/widget.rs
This commit is contained in:
commit
c60495c66c
32 changed files with 773 additions and 419 deletions
|
|
@ -176,6 +176,7 @@ zbus = { workspace = true, optional = true }
|
|||
float-cmp = "0.10.0"
|
||||
ron = { workspace = true, optional = true }
|
||||
enumflags2 = "0.7.12"
|
||||
roxmltree = "0.20"
|
||||
|
||||
# Enable DBus feature on Linux targets
|
||||
[target.'cfg(all(unix, not(any(target_os = "redox", target_family = "wasm", target_os = "android", target_vendor = "apple"))))'.dependencies]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue