Lirusaito 139a10e77c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate ...

Conflicts:
	indra/newview/llpanelface.* -Knew these would conflict just from proximity

2013-06-25 23:49:04 -04: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 git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

2013-06-25 23:49:04 -04: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