Seth Alves fdbfeab3ea Merge branch 'master' of github.com:highfidelity/hifi into fix-accountname-and-goto		2018-02-07 14:22:26 -08:00
..
compiledResources	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
external	GLAD polish	2018-01-14 00:10:05 -08:00
i18n
icon
resources	Merge pull request #12292 from ElderOrb/FB11855	2018-02-07 14:03:16 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into fix-accountname-and-goto	2018-02-07 14:22:26 -08:00
ui
CMakeLists.txt	Merge pull request #12205 from jherico/no_widgets	2018-02-05 15:32:54 -08:00
interface.exe.manifest