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
..
model	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-16 19:53:41 +02:00
view	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-16 19:53:41 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-16 19:53:41 +02:00
editor.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-16 19:53:41 +02:00
editor.hpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-16 19:53:41 +02:00
main.cpp	OpenCS: Set up an osgQt GraphicsWindow in SceneWidget	2015-03-20 16:22:33 +01:00