Brad Davis 4762e1a00c Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp		2015-06-16 21:01:00 -07:00
..
config
fonts	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
html	Info-view	2015-04-26 10:37:14 -07:00
icons	removed id "g3322" in start-script.svg because it is no longer used and causes a "link rect899 hasn't been detected!" message on script editor open.	2015-02-17 18:37:23 +01:00
images	Revert "Revert "Merge pull request #5106 from jherico/render_cursor""	2015-06-13 10:02:54 -07:00
info
mention-sounds	fixed mention sounds dir for deployment	2014-05-12 20:55:24 +02:00
meshes	Default avatar fixes.	2014-11-14 13:02:02 -08:00
qml	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-16 21:01:00 -07:00
shaders	Fix for misaligned color/material textures when resolution is greater than the	2015-01-20 13:07:35 -08:00
sounds	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
styles	Remove custom styling	2014-08-23 00:16:25 +02:00
visage