Skip to content
GitLab
Explore
Sign in
Register
VideoLAN
VLMC
Repository
vlmc
src
Gui
PreviewWidget.cpp
Find file
Blame
History
Permalink
Merge branch 'master' into chouquette_sound_workflow
· 0e3f5919
Hugo Beauzée-Luyssen
authored
Jan 15, 2010
Conflicts: src/Metadata/MetaDataWorker.cpp src/Workflow/ClipWorkflow.cpp
0e3f5919