Shyotl 794dbacea3 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit ...

Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp

2012-11-29 11:54:41 -06:00

..

html

Now we're Vivox license compliant

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

textures

Added icons for folders from phoenix, and created outbox folder icon for future use.

2012-07-18 20:26:19 -04:00

xui

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

2012-11-29 11:54:41 -06:00

colors_base.xml

Fixeds and ToDones

2012-08-05 20:40:02 -04:00

colors.xml

Imported existing code

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