Michael Nilsson 3d3e59eabe solve merge conflict with develop

2016-04-20 16:38:41 -04:00

..

ephemeris

untabify to make merge easier

2016-04-20 15:21:30 -04:00

rendering

solve merge conflict with develop

2016-04-20 16:38:41 -04:00

shaders

untabify to make merge easier

2016-04-20 15:21:30 -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

solve merge conflict

2016-03-30 09:51:34 -04:00

include.cmake

Getting a running version of modularized cmakelists up and running

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