Zach Fox e75a45af92 Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps		2018-09-21 09:43:30 -07:00
..
compiledResources	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
external	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00
i18n
icon
resources	Small bugfixes and using original endpoints	2018-09-19 16:15:59 -07:00
src	Merge pull request #13987 from zfox23/discovery_appUi	2018-09-19 12:38:28 -07:00
ui	Remove Edit > Scripts Editor and all related source files	2017-03-20 00:25:50 -04:00
CMakeLists.txt	adding redirect json to post build in Mac	2018-09-04 11:11:34 -07:00
interface.exe.manifest