1. 03 Nov, 2009 17 commits
  2. 30 Oct, 2009 22 commits
  3. 29 Oct, 2009 1 commit
    • Hugo Beauzee-Luyssen's avatar
      Merge branch 'master' into chouquette_sound_workflow · 0a704488
      Hugo Beauzee-Luyssen authored
      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
      0a704488