David Rowe 5faa7b3e87 Merge branch 'master' into 20851 ... Conflicts: interface/resources/qml/dialogs/MessageDialog.qml		2016-03-17 09:29:56 +13:00
..
config	Remove antialiasing from menus, default to on	2016-02-23 16:24:44 -08:00
controllers	Correcting vive button naming	2016-03-08 15:12:54 -08:00
fonts	Update HiFi glyphs font file	2016-03-10 15:10:44 +13:00
html	Remove obsolete reference to text chat within "about" text.	2016-01-22 10:45:04 -08:00
icons
images
info
mention-sounds
meshes	MyAvatar: added standing and run landing animations	2016-02-05 17:53:50 -08:00
qml	Merge branch 'master' into 20851	2016-03-17 09:29:56 +13:00
shaders
sounds
styles
visage