mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-14 23:39:00 -05:00
dccd439dde
* Solve conflicts in renderablemodel.cpp and renderabletrail.cpp