mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-20 01:01:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
5427dbdeb284dd4bb4ff7af6687213c3e65c3c9b
OpenSpace/include
History
Jonas Strandstedt 5427dbdeb2 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 
Conflicts:
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablefieldlines.cpp
	src/rendering/renderablevolumegl.cpp
	src/rendering/stars/renderablestars.cpp
2014-09-26 17:17:18 +02:00
..
openspace
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2014-09-26 17:17:18 +02:00