Cain Kilgore 60300f5d7b changed to icon (hopefully)		2017-07-13 22:06:44 +01:00
..
external
i18n
icon
resources	changed to icon (hopefully)	2017-07-13 22:06:44 +01:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
ui
CMakeLists.txt
interface.exe.manifest