RebeccaStankus dd48972e44 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering		2018-01-02 14:06:41 -08:00
..
avatar
config
controllers	Embiggen the stick deadspots for oculus touch controllers	2017-11-28 17:11:44 -08:00
fonts	adjust to changed requirements:	2017-11-10 21:20:00 +03:00
html	Fix web entities accessing the webcam	2017-12-12 16:00:17 -07:00
icons
images	4684 Add collapse button on the virtual keyboard	2017-11-10 21:20:00 +03:00
mention-sounds
meshes	Change tablet model's screen	2017-10-18 10:54:18 -07:00
qml	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2	2018-01-02 08:59:42 -08:00
QtWebEngine/UIDelegates
shaders
snapshot/img
sounds	Tighter version of sample sound	2017-10-26 11:48:40 -07:00
styles	better dropdown	2018-01-02 13:56:49 -08:00
visage