Skip to content
GitLab
Explore
Sign in
Register
VideoLAN
VLMC
Repository
vlmc
src
GUI
TracksView.cpp
Find file
Blame
History
Permalink
Merge branch 'master' into chouquette_sound_workflow
· b557add2
Hugo Beauzée-Luyssen
authored
Dec 29, 2009
Conflicts: src/GUI/TracksView.h src/Workflow/MainWorkflow.cpp
b557add2