[vlmc-devel] commit: Merge branch 'master' into effect-engine ( Hugo Beauzée-Luyssen )
git at videolan.org
git at videolan.org
Wed Jul 28 00:22:05 CEST 2010
vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Mon Jul 26 11:59:25 2010 +0200| [edd13a2bdf54e229718b97f63a8151bee2ab09e3] | committer: Hugo Beauzée-Luyssen
Merge branch 'master' into effect-engine
Conflicts:
src/Project/ProjectManager.cpp
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=edd13a2bdf54e229718b97f63a8151bee2ab09e3
---
More information about the Vlmc-devel
mailing list