-
Geoffroy Lacarriere authored
Conflicts: src/GUI/MainWindow.h src/GUI/ui/MainWindow.ui src/Media/Media.cpp src/Media/Media.h vlmc.pro
329ed3e6
Conflicts: src/GUI/MainWindow.h src/GUI/ui/MainWindow.ui src/Media/Media.cpp src/Media/Media.h vlmc.pro
VideoLAN code repository instance