3 commits

Author	SHA1	Message	Date
scrawl	3663511cdb	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/opencs/CMakeLists.txt extern/ogre-ffmpeg-videoplayer/CMakeLists.txt	2015-06-16 19:53:41 +02:00
scrawl	f70250a296	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/launcher/CMakeLists.txt apps/opencs/CMakeLists.txt apps/opencs/view/render/worldspacewidget.cpp apps/openmw/CMakeLists.txt components/CMakeLists.txt extern/osg-ffmpeg-videoplayer/CMakeLists.txt	2015-06-13 21:11:24 +02:00
scrawl	92ef9b1c57	Rename to osg-ffmpeg-videoplayer	2015-04-19 20:14:06 +02:00

Renamed from extern/ogre-ffmpeg-videoplayer/CMakeLists.txt (Browse further)