David Rowe 789f9c7d67 Merge branch 'master' into DOC-124 ... # Conflicts: # interface/src/scripting/Audio.h		2019-08-02 20:34:09 +12:00
..
compiledResources
external
i18n
icon
resources	add control to enable/disable acoustic echo cancellation to simplified UI	2019-07-30 14:09:34 -07:00
src	Merge branch 'master' into DOC-124	2019-08-02 20:34:09 +12:00
ui
CMakeLists.txt	Revert "Merge pull request #15944 from danteruiz/add-signing"	2019-07-23 09:38:32 -07:00
interface.exe.manifest