Dante Ruiz e0f19944bc Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix		2017-04-10 20:58:46 +01:00
..
avatar	Add sitting animations	2017-02-27 16:38:54 -08:00
config
controllers	add foot IK targets as actions	2017-03-30 19:11:16 -07:00
fonts	fix conflict	2017-03-24 14:46:24 -07:00
html	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
icons	Fix issues; checkpoint on new ComboDialog	2017-03-31 14:56:42 -07:00
images	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
mention-sounds
meshes
qml	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix	2017-04-10 20:58:46 +01:00
QtWebEngine/UIDelegates	remove old ../../qml/menus import	2017-03-25 18:37:36 -04:00
shaders
sounds
styles	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
visage