Shyotl a6a69caa4f Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear ...

Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp

2012-02-24 13:21:59 -06:00

..

html

Now we're Vivox license compliant

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

textures

Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear

2012-02-24 13:21:59 -06:00

xui

Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear

2012-02-24 13:21:59 -06:00

colors_base.xml

Revert "Replace all NotifyCautionBoxColor's and AlertCautionBoxColor's that were using tan with black, like Emerald skin's NotifyCautionBoxColor."

2012-02-20 05:05:57 +01:00

colors.xml

Imported existing code

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