mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-07-22 16:43:19 +02:00
Conflicts: assignment-client/src/audio/AudioMixer.cpp assignment-client/src/audio/AudioMixerClientData.cpp interface/interface_en.ts interface/src/Menu.cpp libraries/audio/src/AudioRingBuffer.cpp |
||
---|---|---|
.. | ||
external | ||
resources | ||
src | ||
ui | ||
CMakeLists.txt | ||
interface.icns | ||
interface_en.ts | ||
InterfaceConfig.h.in | ||
InterfaceVersion.h.in |