Michael Nilsson 85225946b9 solved merge conflict

2016-03-18 13:57:28 -04:00

..

ephemeris

Updated copyright header

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

rendering

solved merge conflict

2016-03-18 13:57:28 -04:00

shaders

discard fragment if alpha is 0 in screenspacerenderables

2016-03-18 13:52:11 -04:00

basemodule.cpp

Removed WavefrontGeometry class register and added the MultiModelGeometry class register.

2016-03-16 09:05:16 -04:00

basemodule.h

Updated copyright header

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

CMakeLists.txt

solved merge conflict, fix for close(socket) in paralellconnection

2016-03-17 14:41:05 -04:00

include.cmake

Getting a running version of modularized cmakelists up and running

2015-05-23 02:03:06 +02:00