Marc Zinnschlag 8c4303399f Merge branch 'master' into dialogue ...

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp

2013-11-10 13:21:39 +01:00

..

doc

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

filter

fixed uninitialise scope value for filters

2013-09-27 13:55:28 +02:00

render

Add simple Ogre widget

2013-11-02 02:51:38 +01:00

settings

open user settings dialogue centered

2013-09-08 09:28:43 +02:00

tools

use IdTypeDelegate in report table

2013-09-22 13:54:01 +02:00

world

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00