mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
Files
c6dc42621108b826e23bc20a68f4f7f75a079940
OpenSpace/include
History
Alexander Bock c6dc426211 Merge remote-tracking branch 'origin/feature/galaxy' into develop 
Conflicts:
	data/scene/default.scene
	shaders/PowerScaling/powerScalingMath.hglsl
2016-06-04 19:54:34 +02:00
..
openspace
Merge remote-tracking branch 'origin/feature/galaxy' into develop
2016-06-04 19:54:34 +02:00