Brandon Thomas 081c9fdc5e Merge the landing branch into land-r7 ...

# Conflicts:
#	apps/deckcraft-cli/src/main.rs
#	apps/deckcraft-cli/tests/cli.rs
#	crates/engine/src/cmd/file.rs
#	crates/engine/src/cmd/text.rs
#	crates/engine/src/lib.rs
#	crates/engine/src/tests.rs
#	crates/ui-egui/src/canvas.rs
#	crates/ui-egui/src/lib.rs
#	crates/ui-egui/src/textures.rs

2026-10-14 15:34:15 -04:00

..

cli.rs

Fix up merged PRs: land-r6's changes fitted to the landing branch

2026-10-14 15:23:16 -04:00

convert.rs

Fix up merged PRs: GIF export goes through main's export path

2026-10-14 14:54:35 -04:00

mcp_roots.rs

Merge the landing branch into land-r7

2026-10-14 15:34:15 -04:00