vangel76andClaude Sonnet 5.5 4c8b89a6be Merge upstream/main into fix-1083-beat-marker-audio-pause ...

Conflicts in project/src/lib.rs and ui-egui/src/frames.rs: Comp::same_settings
takes with_markers and is shared by same_pixels_with and changed_span (#1641);
frames identity uses same_pixels_with/reads_markers and drops
same_pixels_ignoring_markers and project_has_expressions.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

2026-10-25 10:33:46 +01:00

..

src

Merge upstream/main into fix-1083-beat-marker-audio-pause

2026-10-25 10:33:46 +01:00

tests

Pixel Motion Blur: synthesize the blur from motion vectors and honour Vector Detail (#535).

2026-10-11 13:32:13 +11:00

Cargo.toml

Merge main into IO-2/SHP-5/OUT-2/PRV-2 work

2026-10-02 22:39:47 -04:00