mirror of
https://github.com/overte-org/overte.git
synced 2025-05-28 21:10:29 +02:00
Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/Menu.cpp interface/src/Menu.h interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp interface/src/ui/ApplicationCompositor.cpp interface/src/ui/overlays/LocalModelsOverlay.cpp |
||
---|---|---|
.. | ||
boostconfig | ||
bullet | ||
glew | ||
glm | ||
gverb | ||
LibOVR | ||
oglplus | ||
openvr | ||
polyvox | ||
qxmpp | ||
sdl2 | ||
soxr | ||
tbb | ||
vhacd | ||
OSXInstallNameChange.cmake |