Skip to content
GitLab
Explore
Sign in
Register
VideoLAN
VLMC
Repository
vlmc
src
Renderer
GenericRenderer.h
Find file
Blame
History
Permalink
Merge branch 'master' into chouquette_sound_workflow
· 7050701e
Hugo Beauzée-Luyssen
authored
Jan 15, 2010
Conflicts: src/Renderer/ClipRenderer.cpp src/Renderer/WorkflowRenderer.h
7050701e