Drake Arconis e767392b44 Merge remote-tracking branch 'shyotl/future' into AltCompilers ...

Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/llvovolume.cpp

2012-08-08 18:54:04 -04: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 remote-tracking branch 'shyotl/future' into AltCompilers

2012-08-08 18:54:04 -04: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