Merge branch 'chouquette_debug_pause'
Conflicts: src/Workflow/ClipWorkflow.cpp src/Workflow/MainWorkflow.cpp src/Workflow/TrackWorkflow.cpp src/renderer/WorkflowRenderer.cpp
Showing
Please register or sign in to comment
Conflicts: src/Workflow/ClipWorkflow.cpp src/Workflow/MainWorkflow.cpp src/Workflow/TrackWorkflow.cpp src/renderer/WorkflowRenderer.cpp