Seth Alves cdb14e7662 put name of button-click file back		2017-01-23 13:55:11 -08:00
..
external
i18n
icon
resources	put name of button-click file back	2017-01-23 13:55:11 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-23 09:44:04 -08:00
ui
CMakeLists.txt
interface.exe.manifest