mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-14 23:39:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
142 Commits 80 Branches 48 Tags
fc291bfed0a5ffe9453578fcd93241eb78d0bea7
Commit Graph

2 Commits

Author SHA1 Message Date
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