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
..
model	Merge branch 'master' into QtOGre	2014-09-30 10:52:04 +10:00
view	Merge branch 'master' into QtOGre	2014-09-30 10:52:04 +10:00
CMakeLists.txt	Merge branch 'run'	2014-09-14 11:59:54 +02:00
editor.cpp	fixed broken content file list in case of newly created addons	2014-09-15 09:51:39 +02:00
editor.hpp	Refactor NIF cache	2014-08-24 02:37:50 +02:00
main.cpp	Merge branch 'operations' into load	2014-05-08 13:17:24 +02:00