Zach Fox f4e2b48dbb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1		2018-02-12 11:02:22 -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 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-09 15:59:38 -08:00
src	Merge pull request #12378 from druiz17/save-avatarUrl	2018-02-09 16:04:35 -08:00
ui
CMakeLists.txt	Merge pull request #12205 from jherico/no_widgets	2018-02-05 15:32:54 -08:00
interface.exe.manifest