aiongg 283f3f5bbc Merge colour-entry: Color Picker and Color panel keep typed values; colours read on a fixed scale (#323) ...

Conflict: crates/engine/src/cmd/style.rs: object.color params doc and enabled = next's (text?, has_text or selection) + the model form; apply_color = next's text targets and caret typing format + the branch's rounding-based swatch reuse
Conflict: crates/ui-egui/src/dialogs.rs: next's deleteCharacterStyle / swatchOptions arms; colorPicker = the branch's (no-op without edits, model-form colour) with next's `text`
Conflict: crates/ui-egui/src/panels/swatches.rs: double-click opens the picker with picker_fields + next's `text`; spectrum = the branch's model form + next's `text`
Conflict: docs/target-app-parity.md: the branch's Color panel line + next's Threading and Place text lines
Conflict: ROADMAP.md: logs both

2026-10-12 22:17:14 +00:00

..

src

Merge colour-entry: Color Picker and Color panel keep typed values; colours read on a fixed scale (#323)

2026-10-12 22:17:14 +00:00

tests

Merge main: atomic desktop and CLI exports, staged book updates, recovery checkpoint retention, exit recovery

2026-10-12 19:46:34 +00:00

Cargo.toml

Merge #84 (update): Text editing, snapping and text threading (#23)

2026-10-12 04:20:34 +00:00