mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
Conflicts: interface/src/Application.cpp interface/src/avatar/MyAvatar.cpp interface/src/scripting/HMDScriptingInterface.cpp interface/src/scripting/HMDScriptingInterface.h |
||
---|---|---|
.. | ||
src/display-plugins | ||
CMakeLists.txt |