scrawl 1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/opencs/view/render/cell.cpp		2015-04-19 02:29:16 +02:00
..
model	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-04-19 02:29:16 +02:00
view	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-04-19 02:29:16 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-04-19 02:29:16 +02:00
editor.cpp	Reintroduce showMarkers flag	2015-03-23 01:57:14 +01:00
editor.hpp	OpenCS: use the new VFS, restored resource tables	2015-03-20 16:22:33 +01:00
main.cpp	OpenCS: Set up an osgQt GraphicsWindow in SceneWidget	2015-03-20 16:22:33 +01:00