mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-07-24 02:04:03 +02:00
Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp libraries/gl/src/gl/OffscreenQmlSurface.h |
||
---|---|---|
.. | ||
external | ||
i18n | ||
icon | ||
resources | ||
src | ||
ui | ||
CMakeLists.txt | ||
interface.exe.manifest |