Conflicts:
	src/EffectsEngine/OutSlot.hpp
	src/GUI/MainWindow.cpp
	src/GUI/ui/MainWindow.ui
	src/LibVLCpp/VLCMedia.cpp
	src/Renderer/WorkflowRenderer.cpp
	src/Renderer/WorkflowRenderer.h
	src/Workflow/ClipWorkflow.cpp
	src/Workflow/ClipWorkflow.h
	src/Workflow/MainWorkflow.cpp
	src/Workflow/MainWorkflow.h
	src/Workflow/TrackWorkflow.cpp
	src/Workflow/TrackWorkflow.h
	vlmc.pro