Brandon Thomas f4316dcfb8 Merge main into fix/issue-29-move-import ... # Conflicts: # docs/parity.md		2026-10-04 16:15:25 -04:00
..
brand	Licensing: MIT OR Apache-2.0 files, NOTICE, ArtCraft brand terms	2026-10-04 10:05:02 -04:00
images	docs: README (MCP, CLI, export, status, contributing), AGENTS.md (asset enforcement, crash recovery, testing/perf), screenshots re-captured with Inter	2026-09-30 23:52:34 -04:00
showcase	M1.4: crash-safe catalog persistence (op log + snapshot)	2026-09-30 23:40:40 -04:00
control-protocol.md	Issue #37: Catalog: compact the log on a background thread with ordered journal boundaries	2026-10-04 16:01:28 -04:00
gpu-pipeline.md	M5.6c: one memory budget for caches, decode gate and GPU pool; peak RSS 1.9-2.3 GB -> 0.83-0.99 GB	2026-10-01 11:35:08 -04:00
mcp.md	Issue #29: Import: Move mode with rename and template folders	2026-10-04 15:39:30 -04:00
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 into fix/issue-29-move-import	2026-10-04 16:15:25 -04:00
web.md	Issue #30: Import Photos… as the clear import entry point	2026-10-04 11:44:15 -04:00
whats-new.md	Merge main into fix/issue-29-move-import	2026-10-04 16:15:25 -04:00
xmp-interop.md	Merge main into feat/copyright-status	2026-10-04 15:26:53 -04:00