howard-stearns 8f44a52140 Merge branch 'end-seeding' of github.com:howard-stearns/hifi into end-seeding		2018-02-23 16:37:00 -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	New UI for new HFC users	2018-02-23 16:36:20 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-23 16:19:54 -08:00
ui
CMakeLists.txt	pull task out of render and into its own lib	2018-02-13 08:56:11 -08:00
interface.exe.manifest