mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-30 05:06:48 -06:00
Conflict: ROADMAP.md: next's IDML1 line kept
Conflict: crates/compose/src/lib.rs: next's rule_color() (#83) for Rule Above
Conflict: crates/engine/src/cmd/text.rs: next's type.para params doc (drop cap fields) and apply_char_attrs
Conflict: crates/ui-egui/src/i18n.rs: one "Tint:" row at #296's position (same as next's 35d011f)
Conflict: crates/ui-egui/src/panels/properties.rs: next's menus::menu_button for the ☰ menu (#281)
Auto-merge duplicated #263's dialog tests and its paragraphRules confirm arm in dialogs.rs; kept one copy of each.