mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 17:51:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
168 Commits 99 Branches 46 Tags
37e5e63b707201700785643ad92ea00636aca12e
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