mirror of
https://github.com/overte-org/overte.git
synced 2025-04-25 17:35:45 +02:00
Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/avatar/Head.cpp interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/devices/3DConnexionClient.cpp interface/src/ui/overlays/Overlays.cpp |
||
---|---|---|
.. | ||
boostconfig | ||
bullet | ||
glew | ||
glm | ||
gverb | ||
LibOVR | ||
oglplus | ||
openvr | ||
polyvox | ||
qxmpp | ||
sdl2 | ||
sixense | ||
soxr | ||
tbb | ||
vhacd | ||
zlib | ||
OSXInstallNameChange.cmake |