mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-08 05:37:37 +02:00
Conflicts: interface/src/avatar/Hand.cpp interface/src/avatar/Hand.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/renderer/Model.h |
||
---|---|---|
.. | ||
external | ||
src | ||
CMakeLists.txt |