druiz17 e4df4369ad Merge pull request #10436 from druiz17/config-ui ... Added the ability to choose puck configuration from the general settings		2017-05-11 13:39:05 -07:00
..
external
i18n
icon
resources	Merge pull request #10436 from druiz17/config-ui	2017-05-11 13:39:05 -07:00
src	Merge pull request #10337 from vladest/audio-source-sync	2017-05-11 12:50:38 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest