NissimHadar c6580f642a Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork		2018-02-22 13:45:00 -08:00
..
avatar	Shoulder puck calibration work in progress	2017-07-24 17:22:48 -07:00
config	Introducing the renderview task	2017-06-06 18:00:41 -07:00
controllers	added control button for controller API	2018-02-13 09:41:00 -08:00
fonts	added image icon	2018-02-02 10:27:44 -08:00
html	Fixed extra " in backup_instructions.html	2018-02-17 18:14:44 +00:00
icons	merge from master	2018-02-13 13:58:39 -08:00
images	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
mention-sounds
meshes	new local reference to image model	2018-02-02 10:27:44 -08:00
qml	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-22 13:45:00 -08:00
QtWebEngine/UIDelegates
shaders	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
snapshot/img	new local reference to image model	2018-02-02 10:27:44 -08:00
sounds	Tighter version of sample sound	2017-10-26 11:48:40 -07:00
styles	Some improvements to the log window	2018-02-08 11:26:02 -08:00
visage