Stephen Birarda 95c172f418 Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66		2018-04-17 15:34:46 -07:00
..
compiledResources
external
i18n
icon
resources	Merge pull request #12862 from zfox23/discovery_April2018	2018-04-17 15:11:50 -07:00
src	Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66	2018-04-17 15:34:46 -07:00
ui
CMakeLists.txt	fix cmake changes for script copy for dev builds	2018-03-28 14:56:53 -07:00
interface.exe.manifest