Branch: refs/heads/chouquette_refactor_clipworkflow
Home:   http://github.com/VLMC/vlmc

Commit: 5652bd1580d949965d84063883bd528363e4f49c
    http://github.com/VLMC/vlmc/commit/5652bd1580d949965d84063883bd528363e4f49c
Author: Ludovic Fauvet <e...@l0cal.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M src/src.pro

Log Message:
-----------
Translations building was broken


Commit: 58ee2fbf0a56f02a77e55aa8b4c7beaf5e704b47
    http://github.com/VLMC/vlmc/commit/58ee2fbf0a56f02a77e55aa8b4c7beaf5e704b47
Author: Ludovic Fauvet <e...@l0cal.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M ts/vlmc_es.ts
  M ts/vlmc_fr.ts
  M ts/vlmc_jp.ts
  M ts/vlmc_sv.ts

Log Message:
-----------
Update translations


Commit: 916264db3a94140f43aacdd02f15abdac4087b19
    http://github.com/VLMC/vlmc/commit/916264db3a94140f43aacdd02f15abdac4087b19
Author: Ludovic Fauvet <e...@l0cal.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M src/GUI/About.cpp
  M src/GUI/About.h
  M src/GUI/AbstractGraphicsMediaItem.cpp
  M src/GUI/AbstractGraphicsMediaItem.h
  M src/GUI/DockWidgetManager.cpp
  M src/GUI/DockWidgetManager.h
  M src/GUI/GraphicsMovieItem.cpp
  M src/GUI/GraphicsMovieItem.h
  M src/GUI/Import.cpp
  M src/GUI/Import.h
  M src/GUI/MainWindow.cpp
  M src/GUI/MainWindow.h
  M src/GUI/PreviewRuler.h
  M src/GUI/PreviewWidget.cpp
  M src/GUI/PreviewWidget.h
  M src/GUI/Timeline.cpp
  M src/GUI/Timeline.h
  M src/GUI/TracksView.cpp
  M src/GUI/TracksView.h
  M src/GUI/UndoStack.cpp
  M src/GUI/UndoStack.h
  M src/GUI/WorkflowFileRendererDialog.cpp
  M src/GUI/library/MediaLibraryWidget.cpp
  M src/GUI/library/MediaLibraryWidget.h
  M src/GUI/settings/AudioProjectPreferences.cpp
  M src/GUI/settings/AudioProjectPreferences.h
  M src/GUI/settings/PreferenceWidget.h
  M src/GUI/settings/VideoProjectPreferences.cpp
  M src/GUI/settings/VideoProjectPreferences.h
  M src/GUI/wizard/ProjectWizard.cpp
  M src/Library/Library.cpp
  M src/Library/Library.h
  M src/Project/ProjectManager.cpp
  M src/Project/ProjectManager.h
  M src/Renderer/WorkflowFileRenderer.cpp
  M src/Workflow/ClipWorkflow.h
  M src/Workflow/MainWorkflow.cpp
  M src/Workflow/VideoClipWorkflow.cpp
  M src/vlmc.h

Log Message:
-----------
Clean up include files.


Commit: b557add23cc3669129ef3e48658b5cfe7482507a
    http://github.com/VLMC/vlmc/commit/b557add23cc3669129ef3e48658b5cfe7482507a
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M src/GUI/About.cpp
  M src/GUI/About.h
  M src/GUI/AbstractGraphicsMediaItem.cpp
  M src/GUI/AbstractGraphicsMediaItem.h
  M src/GUI/DockWidgetManager.cpp
  M src/GUI/DockWidgetManager.h
  M src/GUI/GraphicsMovieItem.cpp
  M src/GUI/GraphicsMovieItem.h
  M src/GUI/Import.cpp
  M src/GUI/Import.h
  M src/GUI/MainWindow.cpp
  M src/GUI/MainWindow.h
  M src/GUI/PreviewRuler.h
  M src/GUI/PreviewWidget.cpp
  M src/GUI/PreviewWidget.h
  M src/GUI/Timeline.cpp
  M src/GUI/Timeline.h
  M src/GUI/TracksView.cpp
  M src/GUI/TracksView.h
  M src/GUI/UndoStack.cpp
  M src/GUI/UndoStack.h
  M src/GUI/WorkflowFileRendererDialog.cpp
  M src/GUI/library/MediaLibraryWidget.cpp
  M src/GUI/library/MediaLibraryWidget.h
  M src/GUI/settings/AudioProjectPreferences.cpp
  M src/GUI/settings/AudioProjectPreferences.h
  M src/GUI/settings/PreferenceWidget.h
  M src/GUI/settings/VideoProjectPreferences.cpp
  M src/GUI/settings/VideoProjectPreferences.h
  M src/GUI/wizard/ProjectWizard.cpp
  M src/Library/Library.cpp
  M src/Library/Library.h
  M src/Project/ProjectManager.cpp
  M src/Project/ProjectManager.h
  M src/Renderer/WorkflowFileRenderer.cpp
  M src/Workflow/MainWorkflow.cpp
  M src/Workflow/VideoClipWorkflow.cpp
  M src/src.pro
  M src/vlmc.h
  M ts/vlmc_es.ts
  M ts/vlmc_fr.ts
  M ts/vlmc_jp.ts
  M ts/vlmc_sv.ts

Log Message:
-----------
Merge branch 'master' into chouquette_sound_workflow

Conflicts:
        src/GUI/TracksView.h
        src/Workflow/MainWorkflow.cpp


Commit: a1e883494ee318bd61cafc84fd2dd02561ee0f14
    http://github.com/VLMC/vlmc/commit/a1e883494ee318bd61cafc84fd2dd02561ee0f14
Author: Hugo Beauzee-Luyssen <beauz...@gmail.com>
Date:   2009-12-29 (Tue, 29 Dec 2009)

Changed paths:
  M src/GUI/About.cpp
  M src/GUI/About.h
  M src/GUI/AbstractGraphicsMediaItem.cpp
  M src/GUI/AbstractGraphicsMediaItem.h
  M src/GUI/DockWidgetManager.cpp
  M src/GUI/DockWidgetManager.h
  M src/GUI/GraphicsMovieItem.cpp
  M src/GUI/GraphicsMovieItem.h
  M src/GUI/Import.cpp
  M src/GUI/Import.h
  M src/GUI/MainWindow.cpp
  M src/GUI/MainWindow.h
  M src/GUI/PreviewRuler.h
  M src/GUI/PreviewWidget.cpp
  M src/GUI/PreviewWidget.h
  M src/GUI/Timeline.cpp
  M src/GUI/Timeline.h
  M src/GUI/TracksView.cpp
  M src/GUI/TracksView.h
  M src/GUI/UndoStack.cpp
  M src/GUI/UndoStack.h
  M src/GUI/WorkflowFileRendererDialog.cpp
  M src/GUI/library/MediaLibraryWidget.cpp
  M src/GUI/library/MediaLibraryWidget.h
  M src/GUI/settings/AudioProjectPreferences.cpp
  M src/GUI/settings/AudioProjectPreferences.h
  M src/GUI/settings/PreferenceWidget.h
  M src/GUI/settings/VideoProjectPreferences.cpp
  M src/GUI/settings/VideoProjectPreferences.h
  M src/GUI/wizard/ProjectWizard.cpp
  M src/Library/Library.cpp
  M src/Library/Library.h
  M src/Project/ProjectManager.cpp
  M src/Project/ProjectManager.h
  M src/Renderer/WorkflowFileRenderer.cpp
  M src/Workflow/MainWorkflow.cpp
  M src/Workflow/VideoClipWorkflow.cpp
  M src/src.pro
  M src/vlmc.h
  M ts/vlmc_es.ts
  M ts/vlmc_fr.ts
  M ts/vlmc_jp.ts
  M ts/vlmc_sv.ts

Log Message:
-----------
Merge branch 'chouquette_sound_workflow' into chouquette_refactor_clipworkflow


_______________________________________________
vlmc-devel mailing list
vlmc-devel@vlmc.org
http://vlmc.org/mailman/listinfo/vlmc-devel

Reply via email to