Dante Ruiz c97d646083 making requested changes and fixing compile issue for jenkins		2018-09-11 15:57:44 -07:00
..
compiledResources
external
i18n
icon
resources	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged	2018-09-06 17:37:36 -07:00
src	making requested changes and fixing compile issue for jenkins	2018-09-11 15:57:44 -07:00
ui
CMakeLists.txt	adding redirect json to post build in Mac	2018-09-04 11:11:34 -07:00
interface.exe.manifest