cc9cii 312b7cd571 Merge branch 'master' into QtOGre ... Conflicts: apps/opencs/model/doc/document.cpp apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/pagedworldspacewidget.hpp components/nif/niffile.hpp libs/openengine/bullet/physic.hpp		2014-09-30 10:52:04 +10:00
..
Ogre	Merge branch 'master' into QtOGre	2014-09-30 10:52:04 +10:00