Melanie 2cfafadbcd Merge branch 'master' of github.com:singularity-viewer/SingularityViewer ...

Conflicts:
	indra/newview/hippogridmanager.cpp
	indra/newview/hippogridmanager.h

2013-04-28 20:32:58 +02: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 github.com:singularity-viewer/SingularityViewer

2013-04-28 20:32:58 +02: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