Merge branch 'main' into read_receipt_display

project-robius · Jan 23, 2025 · 01756fa · 01756fa
2 parents a418b92 + a698f1b
commit 01756fa
Show file tree

Hide file tree

Showing 8 changed files with 357 additions and 238 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 
 [dependencies]
 # makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" }
-makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "hits_without_mark_as_handled" }
+makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "new_hits_old_redraw" }
 
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
 robius-use-makepad = "0.1.1"