mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 20:50:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
Files
5ced910f797cf993a81adf47db84c151b166dbbd
OpenSpace/include
History
Emil Axelsson 5ced910f79 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	include/openspace/scene/scenegraphnode.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/interactionmode.cpp
2017-07-18 10:54:41 +02:00
..
openspace
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-07-18 10:54:41 +02:00