samcake 5d4b55eeea Merge branch 'master' of https://github.com/highfidelity/hifi into skin		2016-07-12 09:19:28 -07:00
..
external
i18n
icon
resources	Merge pull request #6959 from Triplelexx/20769	2016-07-11 14:24:52 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-12 09:19:28 -07:00
ui
CMakeLists.txt
interface.exe.manifest