Atlante45 7bad82818b Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master		2018-02-22 14:45:41 -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 branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-02-22 14:45:41 -08:00
src	Merge remote-tracking branch 'upstream/stable' into HEAD	2018-02-22 10:20:10 -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