Seth Alves 902e3d41d6 merge from upstream		2017-03-24 08:20:35 -07:00
..
avatar	Add sitting animations	2017-02-27 16:38:54 -08:00
config
controllers	fix LX behaviour in snap/advanced/basic	2017-03-14 14:21:21 -07:00
fonts	magical new glyphs	2017-03-01 13:57:03 -07:00
html	remove About Interface from File menu	2017-03-17 17:37:19 +00:00
icons	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
images	switch to using glyph button	2017-02-27 12:44:23 -07:00
mention-sounds
meshes
qml	merge from upstream	2017-03-24 08:20:35 -07:00
QtWebEngine/UIDelegates
shaders
sounds
styles	font change	2017-03-16 11:57:46 -07:00
visage