Seth Alves ea03f41b57 Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid		2017-02-18 10:32:11 -08:00
..
external
i18n
icon
resources	Fix for toolbar visibility after snapshots.	2017-02-17 11:04:04 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-18 10:32:11 -08:00
ui
CMakeLists.txt
interface.exe.manifest