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
..
doc	Merge branch 'master' into QtOGre	2014-09-30 10:52:04 +10:00
filter	removed OpenCS-specific custom Filter record struct (default ESM struct will do from now on)	2014-08-10 21:03:45 +02:00
settings	removed a redundant (and unsufficiently configured) copy of ConfigurationManager	2014-05-10 17:46:10 +02:00
tools	Merge branch 'run'	2014-09-14 11:59:54 +02:00
world	Merge branch 'records'	2014-09-20 13:59:45 +02:00