Anthony J. Thibault 79d9bbe6c5 Merge branch 'master' into feature/pole-vector		2017-06-22 13:37:55 -07:00
..
avatar	Enabled elbow pole vectors	2017-06-16 17:29:56 -07:00
config	Introducing the renderview task	2017-06-06 18:00:41 -07:00
controllers	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 16:15:03 -07:00
fonts	update fonts	2017-06-19 14:41:00 -07:00
html	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
icons	replace mic-mute icons with red variants	2017-06-19 15:07:28 -07:00
images	finished calibration-ui	2017-06-21 01:07:12 +01:00
mention-sounds
meshes	put back defaultAvatar_full.fst mode to 644	2017-06-09 13:55:57 -07:00
qml	Merge pull request #10729 from druiz17/hand-pucks	2017-06-21 18:10:15 -07:00
QtWebEngine/UIDelegates	remove old ../../qml/menus import	2017-03-25 18:37:36 -04:00
shaders
snapshot/img	Add placeholder image when previous snapshot can't be loaded	2017-05-31 10:27:17 -07:00
sounds	add sample sound	2017-06-19 14:41:01 -07:00
styles	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
visage