Merge remote-tracking branch 'upstream/master' into local/yoda-main
# Conflicts: # Cargo.lock # src/view/mod.rs
This commit is contained in:
commit
d2910685cc
8 changed files with 999 additions and 555 deletions
|
|
@ -92,3 +92,11 @@ mime = { path = "../window_clipboard/mime" }
|
|||
[profile.dev]
|
||||
# Not usable at opt-level 0, at least with software renderer
|
||||
opt-level = 1
|
||||
|
||||
# [patch.'https://github.com/pop-os/libcosmic']
|
||||
# libcosmic = { path = "../libcosmic" }
|
||||
# cosmic-config = { path = "../libcosmic/cosmic-config" }
|
||||
# cosmic-theme = { path = "../libcosmic/cosmic-theme" }
|
||||
# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
|
||||
# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
|
||||
# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue