mirror of
https://github.com/storytold/designcraft.git
synced 2026-11-02 14:47:05 -06:00
Conflict: crates/tools/src/tests.rs: both sides' tests (thread ports, pen add/delete) Conflict: crates/ui-egui/src/canvas.rs: the branch's cursors::show for the icon, then next's loaded-text/thread badge; next's cursor_icon dropped for cursors::system Conflict: crates/ui-egui/src/lib.rs: DesignApp fields from both sides