Skip to content
GitLab
Explore
Sign in
Register
VideoLAN
VLMC
Repository
vlmc
src
GUI
MainWindow.h
Find file
Blame
History
Permalink
Merge branch 'master' into boubak-effects-engine
· 9b1badd1
Vincent Carrubba
authored
Oct 16, 2009
Conflicts: src/GUI/MainWindow.cpp src/GUI/ui/MainWindow.ui
9b1badd1