Brandon Thomas 59140d8265 Merge branch 'worktree-agent-aada35d252224c5cd' ...

# Conflicts:
#	crates/engine/src/media.rs
#	crates/ui-egui/src/state.rs

2026-10-01 11:11:49 -04:00

..

images

…

showcase

…

control-protocol.md

…

gpu-pipeline.md

…

mcp.md

…

merge.md

Merge main (Photo Merge); M1.14b: stack merge results with their sources

2026-10-01 11:00:51 -04:00

parity.md

Merge main (Photo Merge); M1.14b: stack merge results with their sources

2026-10-01 11:00:51 -04:00

web.md

…

xmp-interop.md

…