mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-02 18:13:39 +00:00
b2db24400e
Conflicts resolved as unions of both sides: codecs re-exports (PngRows + TiffBands), smart_cmds source imports (main's source_surface_from_buffer and cache API with #8571's svg_source_image_in/convert_svg_source; main's duplicate rendering import dropped), io flat.rs test modules (#8536's banded TIFF tests and main's PNG ones), menus/invoke.rs (#8571's smart SVG intercept and main's layer.selectUnderCursor), state.rs (#8311's type_box_overflow and main's type_insertion_style), the canvas_geom test keeps the is_finite guard, docs status lines keep both change lists, i18n catalogs keep both sides' rows (hi.tsv: main's wording where both added the same string).