4 Commits

Author	SHA1	Message	Date
Alexander Bock	a6ebddb8eb	Updated copyright header in all files	2015-02-17 14:20:03 +01:00
Alexander Bock	61f2f51cb0	Compile fixes of SpiceManager for Mac	2014-08-19 12:14:34 +02:00
Jonas Strandstedt	59c92ca073	Merge branch 'develop' into kameleon ... Conflicts: src/rendering/renderablevolume.cpp src/rendering/renderablevolumeexpert.cpp	2014-04-24 12:14:02 -04:00
Hans-Christian Helltegen	b259c64655	Merge work and bugfixes	2014-04-14 11:40:53 -04:00