Shyotl 77f09744ab Merge branch 'AlericMaster' into V2Renderer ...

Conflicts:
	indra/llcommon/aithreadsafe.h
	indra/newview/pipeline.cpp

2011-05-20 12:56:23 -05:00

..

html

Now we're Vivox license compliant

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

textures

More various small, old patches.

2011-05-04 19:48:16 +02:00

xui/en-us

Merge branch 'AlericMaster' into V2Renderer

2011-05-20 12:56:23 -05: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