Lirusaito 22435b4b91 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Frosting ...

Conflicts:
	indra/newview/llviewerwindow.cpp

2013-04-17 21:06:57 -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 'master' of https://github.com/singularity-viewer/SingularityViewer into Frosting

2013-04-17 21:06:57 -04:00

colors_base.xml

Fix small copy paste buggy

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

colors.xml

…