Brandon Thomas 54e62c0c88 Merge branch 'worktree-agent-a70a415ce57f73911' ...

# Conflicts:
#	crates/engine/src/commands/mod.rs
#	crates/engine/src/lib.rs
#	crates/ui-egui/src/panels/effect_controls.rs
#	crates/ui-egui/src/panels/mod.rs
#	crates/ui-egui/src/state.rs

2026-10-02 09:22:05 -04:00

..

src

Merge branch 'worktree-agent-a70a415ce57f73911'

2026-10-02 09:22:05 -04:00

Cargo.toml

M13.1/M13.2: paint (Brush, Clone Stamp, Eraser) and puppet pins

2026-10-02 09:12:10 -04:00