Siana Gearz f05edda4f4 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear ...

Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloatermessagelog.cpp
	indra/newview/llstartup.cpp
	indra/newview/llviewermenu.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/menu_inventory.xml

2012-03-28 22:27:45 +02:00

..

html

Now we're Vivox license compliant

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

textures

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

2012-03-28 22:27:45 +02:00

xui

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

2012-03-28 22:27:45 +02: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