Marek Kochanowicz 269a357644 Merge remote-tracking branch 'master/refs' into dialog-fix ...

Conflicts:
	CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/dialoguesubview.cpp

2014-06-09 11:51:41 +02:00

..

doc

removed two unused files

2014-05-10 17:35:11 +02:00

filter

removed signals

2014-04-15 20:39:19 +02:00

render

SceneWidget windowHandle fix for Windows.

2014-05-17 23:53:33 +10:00

settings

Decoupled setting definitions from the Setting class. QSettings

2014-05-07 21:59:26 -05:00

tools

added load error log

2014-05-10 12:04:36 +02:00

world

Merge remote-tracking branch 'master/refs' into dialog-fix

2014-06-09 11:51:41 +02:00