mirror of
https://github.com/JulianGro/overte.git
synced 2025-08-03 22:45:33 +02:00
Conflicts: libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp libraries/shared/src/GLMHelpers.cpp |
||
---|---|---|
.. | ||
src/display-plugins | ||
CMakeLists.txt |