Seth Alves 3e516cd2dd Merge branch 'quickfix-tractor' of github.com:AndrewMeadows/hifi into test-12347		2018-02-07 10:48:19 -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	AvatarActionHold has positional and rotational targets	2018-02-07 10:45:13 -08:00
ui
CMakeLists.txt	Merge pull request #12205 from jherico/no_widgets	2018-02-05 15:32:54 -08:00
interface.exe.manifest