mirror of
https://github.com/overte-org/overte.git
synced 2025-08-05 04:41:15 +02:00
Conflicts: interface/src/Application.cpp interface/src/GLCanvas.cpp interface/src/devices/OculusManager.cpp interface/src/devices/OculusManager.h libraries/render-utils/src/DeferredLightingEffect.cpp |
||
---|---|---|
.. | ||
src/gpu | ||
CMakeLists.txt |