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 remote-tracking branch 'cc9cii/Bug-No-1301'

2014-09-16 12:52:12 +02:00

filter

Merge remote-tracking branch 'cc9cii/Bug-No-1301'

2014-09-16 12:52:12 +02:00

render

Merge branch 'master' into QtOGre

2014-09-30 10:52:04 +10:00

settings

Place the settings window on the center of window with keyboard focus. Should resolve Bug #1838.

2014-09-10 20:00:07 +10:00

tools

make delegates use the whole document instead of the undo stack

2014-08-23 12:25:12 +02:00

widget

rewrote run tool profile management

2014-09-13 18:53:35 +02:00

world

Fix cppcheck issues

2014-09-26 17:48:14 +02:00