Skip to content
GitLab
Explore
Sign in
Register
VideoLAN
VLMC
Repository
vlmc
src
Project
ProjectManager.cpp
Find file
Blame
History
Permalink
Merge branch 'master' into effect-engine
· edd13a2b
Hugo Beauzée-Luyssen
authored
Jul 26, 2010
Conflicts: src/Project/ProjectManager.cpp
edd13a2b