mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 11:09:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
Files
1de2d2fea1c7995115947132db113d8502735062
OpenSpace/include
History
Hans-Christian Helltegen 1de2d2fea1 Merge branch 'develop' into VolumeRaycasterAsRenderable 
Conflicts:
	config/sgct/single.xml
	include/openspace/engine/openspaceengine.h
	include/openspace/flare/flare.h
	include/openspace/rendering/volumeraycastersinglepass.h
	src/engine/openspaceengine.cpp
	src/flare/flare.cpp
	src/rendering/volumeraycaster.cpp
2014-04-23 10:28:41 -04:00
..
openspace
Merge branch 'develop' into VolumeRaycasterAsRenderable
2014-04-23 10:28:41 -04:00