Lirusaito 5fc712104a Merge branch 'master' of https://bitbucket.org/SingularityViewer/singularityviewer into Frosting ...

Conflicts:
	indra/newview/linux_tools/wrapper.sh

2013-05-12 03:33:34 -04:00

..

html

…

textures

Merge remote-tracking branch 'upstream/release'

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

xui

Merge branch 'master' of https://bitbucket.org/SingularityViewer/singularityviewer into Frosting

2013-05-12 03:33:34 -04:00

colors_base.xml

Fix small copy paste buggy

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

colors.xml

…