Brad Davis 2a1776303d Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp		2015-07-03 06:17:35 -07:00
..
config
fonts
html
icons
images	Merge remote-tracking branch 'upstream/master' into plugins	2015-06-29 10:55:39 -07:00
info
mention-sounds
meshes
qml	make the tooltip background darker	2015-06-29 11:05:59 -07:00
shaders
sounds	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
styles
visage