mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
Conflicts: interface/src/Audio.cpp interface/src/Menu.cpp interface/src/avatar/Avatar.h interface/src/avatar/MyAvatar.cpp interface/src/devices/Webcam.cpp interface/src/devices/Webcam.h interface/src/renderer/FBXReader.cpp |
||
---|---|---|
.. | ||
FindFaceshift.cmake | ||
FindGLM.cmake | ||
FindLibOVR.cmake | ||
FindMotionDriver.cmake | ||
FindQuazip.cmake | ||
FindSixense.cmake |