Aleric Inglewood 227c621dad Merge remote-tracking branch 'slb/master' ...

Conflicts:
	indra/newview/llnetmap.cpp
	indra/newview/llnetmap.h
	indra/newview/skins/default/xui/en-us/menu_mini_map.xml

2013-09-29 16:56:55 +02:00

..

html

…

textures

First attempt to deal with broken (pre multiwear) inventory items.

2013-08-18 02:50:31 +02:00

xui

Merge remote-tracking branch 'slb/master'

2013-09-29 16:56:55 +02:00

colors_base.xml

Color improvement for radar shout range color for skins that don't override the default, contributed by Aquafox Ruggles

2013-07-25 08:15:18 -04:00

colors.xml

…