• Hugo Beauzee-Luyssen's avatar
    Merge branch 'chouquette_frame_by_frame' · 8a4a97b7
    Hugo Beauzee-Luyssen authored
    Conflicts:
    	src/Workflow/ClipWorkflow.cpp
    	src/Workflow/MainWorkflow.cpp
    	src/Workflow/MainWorkflow.h
    	src/Workflow/TrackWorkflow.cpp
    	src/Workflow/TrackWorkflow.h
    	src/gui/MainWindow.cpp
    	src/renderer/WorkflowRenderer.cpp
    8a4a97b7
MainWorkflow.h 5.48 KB