Michael Nilsson bf6a8e249a solve merge conflict

2016-04-04 16:02:27 -04:00

..

rendering

solve merge conflict

2016-04-04 16:02:27 -04:00

shaders

Add cygnetPlane class

2016-03-30 17:42:45 -04:00

util

solve merge conflict

2016-04-04 16:02:27 -04:00

CMakeLists.txt

add screenspacecygnets

2016-03-31 12:17:32 -04:00

info

Add cygnetPlane class

2016-03-30 17:42:45 -04:00

iswamodule.cpp

Seperated iSWAManager and iSWAContainer

2016-03-31 10:53:03 -04:00

iswamodule.h

renamed module dataplane to iswa

2016-03-30 15:27:31 -04:00