Michael Nilsson a76d4bd277 solved merge conflict

2016-05-24 16:25:45 -04:00

..

ext/imgui

Updated copyright header

2016-02-05 17:43:21 +01:00

include

Auto filter property

2016-05-24 16:00:18 -04:00

shaders

Updated copyright header

2016-02-05 22:47:37 +01:00

src

solved merge conflict

2016-05-24 16:25:45 -04:00

CMakeLists.txt

Moved renderproperties functions

2016-05-18 09:33:32 -04:00

include.cmake

Moving onscreen gui into its own module

2015-05-26 22:52:12 +02:00

onscreenguimodule.cpp

Updated copyright header

2016-02-05 17:43:21 +01:00

onscreenguimodule.h

Updated copyright header

2016-02-05 17:43:21 +01:00