ruchirguitar 1ab2743f8e G5: resolve Tech Circuit documentation merge conflict ...

Merge current main and retain both the Pencil snapping documentation and Tech Circuit library evidence. Only docs/mcp.md required manual conflict resolution. Focused checks passed: no conflict markers or whitespace errors, all 28 catalogs retain four unique nonempty labels, and brush implementation/tests remain unchanged. No full local Cargo CI rerun.

2026-11-15 07:21:46 +05:30

..

brand

…

images

…

3d-lighting-performance.md

…

affinity-validation.md

AF.4 docs: leave out shop listings and sandbox notes

2026-10-09 22:20:39 +07:00

architecture.md

…

contributors.md

…

control-protocol.md

Merge pull request #7291 from dotCooCoo/feat/live-paint-bucket-multi-click

2026-11-15 08:25:35 +07:00

development.md

Merge main into feat/da-complete-messages

2026-11-14 07:35:35 -08:00

dimensions.md

Merge pull request #7477 from dotCooCoo/fix/dimension-second-point-guides

2026-11-15 00:39:29 +07:00

effects-parity.md

Effects: Effect › SVG Filters lists default filters

2026-11-14 11:19:22 -08:00

egui-037-migration-plan.md

…

file-format-parity.md

Merge main into feat/open-pdf-pages-as-links

2026-11-14 12:23:47 -08:00

gaps.md

G5: preserve current main alongside Tech Circuit

2026-11-15 02:46:09 +05:30

hardware-parity.md

…

image-trace-adjustments.md

Merge main into feat/trace-preset-defaults

2026-11-14 12:48:25 -08:00

image-trace-quality.md

…

localization-hi.md

Merge main into fix/hindi-label-senses

2026-11-14 09:52:16 -08:00

localization-parity.md

Merge pull request #7206 from dotCooCoo/fix/hindi-label-senses

2026-11-15 08:25:53 +07:00

mcp.md

G5: resolve Tech Circuit documentation merge conflict

2026-11-15 07:21:46 +05:30

pdf-backend.md

…

plugins.md

Merge pull request #7460 from dotCooCoo/fix/plugin-store-folder-lock

2026-11-14 21:49:19 +07:00

print-tiling.md

…

releasing.md

…

revolve.md

…

roadmap.md

G5: resolve Tech Circuit documentation merge conflict

2026-11-15 07:21:46 +05:30

shaper.md

…

target-app-parity.md

G5: resolve Tech Circuit documentation merge conflict

2026-11-15 07:21:46 +05:30

three-d.md

Merge main into fix/3d-masked-cap-graphic-once

2026-11-14 09:55:12 -08:00

type-parity.md

Merge pull request #7681 from dotCooCoo/feat/east-asian-glyph-forms

2026-11-15 06:17:55 +07:00

typography-lettering.md

…

ui-parity.md

G5: preserve current main alongside Tech Circuit

2026-11-15 02:46:09 +05:30