David Rowe 07697c5083 Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.		2017-07-01 11:19:00 +12:00
..
avatar	Eliminated to wiggle while pucks are enabled.	2017-06-26 14:09:10 -07:00
config	Introducing the renderview task	2017-06-06 18:00:41 -07:00
controllers	Implement fingers control	2017-06-22 23:32:06 +12: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	Merge pull request #10743 from humbletim/21383	2017-06-26 09:54:04 -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 branch 'master' into 21418	2017-07-01 11:19:00 +12:00
QtWebEngine/UIDelegates
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
visage