Lirusaito c24950b261 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer ...

Conflicts:
	indra/newview/llfloateravatarpicker.cpp - Includes to v-d style, since plain alphabetical just won't cut it. Shyotl's changes for name system, here.
	indra/newview/llpanelgroupinvite.cpp - Shyotl's changes for name system, here.

Also corrected new README to have less typos and be slightly more accurate.

2012-12-10 11:24:25 -05: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/singularity-viewer/SingularityViewer

2012-12-10 11:24:25 -05: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