Dante Ruiz 8f402c73b0 saving work 2.0		2017-03-31 01:18:31 +01:00
..
external
i18n
icon
resources	saving work 2.0	2017-03-31 01:18:31 +01:00
src	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -07:00
ui
CMakeLists.txt
interface.exe.manifest