Anthony J. Thibault 80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers ... Conflicts: interface/src/Application.cpp libraries/input-plugins/src/input-plugins/SixenseManager.cpp		2015-07-20 15:18:23 -07:00
..
config
fonts
html
icons
images	Merge branch 'master' into plugins	2015-07-13 19:52:53 -07:00
info
mention-sounds
meshes
qml	Working on line height	2015-07-17 14:33:32 -07:00
shaders
sounds	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
styles	experimenting with input plugins	2015-06-30 09:52:54 -07:00