mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-13 07:21:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
Files
f307dfb64acd73aa6067a9f691afca484f078e13
OpenSpace/include
History
Alexander Bock f307dfb64a Merge branch 'master' into feature/shadows 
# Conflicts:
#	modules/base/rendering/renderablemodel.h
#	modules/globebrowsing/src/renderableglobe.cpp
#	modules/globebrowsing/src/renderableglobe.h
#	src/rendering/renderengine.cpp
2025-12-18 16:19:33 +01:00
..
openspace
Merge branch 'master' into feature/shadows
2025-12-18 16:19:33 +01:00