Siana Gearz fd22d80dfd Merge branch 'future' of https://github.com/Shyotl/SingularityViewer ...

Conflicts:
	indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
	indra/newview/llmanipscale.cpp
	indra/newview/llmeshrepository.cpp
	indra/newview/llviewerregion.cpp
	indra/newview/llvovolume.cpp

2011-12-24 20:12:12 +01:00

..

html

Now we're Vivox license compliant

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

textures

Resolved nametag bubble image failing to load promptly. Also updated texture to that used in v3, as it looks cleaner.

2011-12-10 22:50:26 -06:00

xui

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2011-12-24 20:12:12 +01:00

colors_base.xml

Adding ComboBGColor to default skin.

2010-10-05 11:13:19 -04:00

colors.xml

Imported existing code

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