Shyotl 93ca5d3482 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git into Moap ...

Conflicts:
	indra/newview/skins/default/xui/en-us/floater_active_speakers.xml

2013-06-27 22:07:31 -05:00

..

html

Now we're Vivox license compliant

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

textures

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

2013-06-23 22:36:04 -04:00

xui

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git into Moap

2013-06-27 22:07:31 -05:00

colors_base.xml

Fix small copy paste buggy

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

colors.xml

Imported existing code

2010-04-02 02:48:44 -03:00