Lirusaito fb39f2d511 Merge branch 'master' into ManagedMarketplace ...

# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lltooldraganddrop.h

2019-02-28 23:58:08 -05:00

..

html

Fix libpng warning: iCCP: known incorrect sRGB profile

2014-10-22 20:50:11 -04:00

textures

Merge branch 'master' into ManagedMarketplace

2019-02-28 23:58:08 -05:00

xui

Merge branch 'master' into ManagedMarketplace

2019-02-28 23:58:08 -05:00

colors_base.xml

Fix Issue 1577: Color yellow hard to read on Radar

2014-07-09 03:00:38 -04:00

colors.xml

…