mirror of
https://github.com/storytold/effectcraft.git
synced 2026-11-13 13:52:16 +00:00
Merge remote-tracking branch 'origin/main' into codex/778-effect-migration
# Conflicts: # crates/aep/src/container.rs # crates/aep/src/container/aepx.rs # crates/aep/src/container/arbitrary.rs # crates/aep/src/container/camera.rs # crates/aep/src/container/effects.rs # crates/aep/src/container/footage.rs # crates/aep/src/container/header.rs # crates/aep/src/container/keys.rs # crates/aep/src/container/masks.rs # crates/aep/src/container/read.rs # crates/aep/src/container/settings.rs # crates/aep/src/container/shapes.rs # crates/aep/src/container/textdoc.rs # crates/aep/src/container/typed.rs # crates/aep/src/container/values.rs # crates/aep/src/container/version.rs # crates/aep/src/container/write.rs # crates/aep/src/import/markers.rs # crates/aep/tests/it/container.rs # crates/aep/tests/it/container/batch3_core.rs # crates/aep/tests/it/container/batch3_objects.rs # crates/aep/tests/it/container/cases_600.rs # crates/aep/tests/it/container/header.rs # crates/aep/tests/it/container/helpers.rs # crates/aep/tests/it/container/keyframes.rs # crates/aep/tests/it/container/layer_switches.rs # crates/aep/tests/it/container/matte.rs # crates/aep/tests/it/container/robustness.rs # crates/aep/tests/it/container/text_markers_footage.rs # crates/aep/tests/it/container/typed.rs # crates/aep/tests/it/container/values.rs
This commit is contained in:
commit
8dca7d4e8a
29 files changed
+1588
-499
No files matched your search
Generated
+1
@@ -1574,6 +1574,7 @@ dependencies = [
|
||||
"effectcraft-keyframe",
|
||||
"effectcraft-project",
|
||||
"effectcraft-time",
|
||||
"log",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror 2.0.21",
|
||||
|
||||
Reference in new issue
Block a user