Zach Fox bf5d6de780 Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots		2018-06-12 11:19:05 -07:00
..
compiledResources
external
i18n
icon
resources	Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains	2018-06-11 10:46:55 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots	2018-06-12 11:19:05 -07:00
ui
CMakeLists.txt	Use binary resources on OSX	2018-06-06 15:10:52 -07:00
interface.exe.manifest