Dante Ruiz 067fc9bb98 fixed merge conflict		2017-06-12 16:45:34 +01:00
..
avatar	compute rotation from derivative of spline	2017-06-08 15:00:12 -07:00
config
controllers	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 16:15:03 -07:00
fonts	Fix icon for polylines in entities editor properties page	2017-06-03 06:26:13 +12:00
html	Fix keyboard not raising for Facebook username field	2017-04-30 11:40:28 +12:00
icons	Display spinner in Web controls when they're loading an HTTP page	2017-05-23 15:40:35 +12:00
images	Compress Default Skybox with BC7	2017-05-18 13:13:40 -07:00
mention-sounds
meshes
qml	fixed merge conflict	2017-06-12 16:45:34 +01: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	Implemented snap sound using sound injector	2017-04-20 17:43:16 +02:00
styles
visage