Dante Ruiz a03cfb835d Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update		2018-02-07 10:39:23 -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 #12316 from zfox23/commerce_inspectionCertRedesign	2018-02-07 10:19:30 -08:00
src	fix variable naming and edge case	2018-02-05 15:31:37 -08:00
ui
CMakeLists.txt	Merge pull request #12205 from jherico/no_widgets	2018-02-05 15:32:54 -08:00
interface.exe.manifest