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

Conflicts:
	indra/newview/lldynamictexture.cpp

2012-03-31 01:54:53 +02:00

..

html

…

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-31 01:54:53 +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

…