Skip to content
GitLab
Explore
Sign in
Register
VideoLAN
VLMC
Repository
vlmc
src
GUI
Import
ImportController.cpp
Find file
Blame
History
Permalink
Merge remote branch 'origin/master' into geoff_import
· 03c4614a
Geoffroy Lacarriere
authored
Oct 30, 2009
Conflicts: src/GUI/MainWindow.cpp src/GUI/ui/MainWindow.ui vlmc.pro
03c4614a