Lirusaito fd453593b3 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate ...

Conflicts:
	indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
	indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
	indra/newview/llfloaterobjectiminfo.cpp - simple merge
	indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
	indra/newview/llviewermedia.cpp - includes conflict, simple stuff.

SLURL update:
	indra/newview/llavataractions.cpp
	indra/newview/llgroupactions.cpp

2013-06-11 15:32:18 -04:00

..

html

Now we're Vivox license compliant

2011-01-07 17:07:00 +01:00

textures

Merge remote-tracking branch 'upstream/release'

2013-04-09 19:52:13 +02:00

xui

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-11 15:32:18 -04:00

colors_base.xml

Fix small copy paste buggy

2013-03-12 00:59:24 -04:00

colors.xml

…