Shyotl 3f3ead0988 Merge branch 'master' into AISv3-WIP ...

Conflicts:
	indra/newview/llinventorybridge.cpp

2015-06-27 01:30:28 -05:00

..

html

Fix libpng warning: iCCP: known incorrect sRGB profile

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

textures

Port Region Tracker Floater from Alchemy~

2015-03-21 03:45:09 -04:00

xui

Merge branch 'master' into AISv3-WIP

2015-06-27 01:30:28 -05:00

colors_base.xml

…

colors.xml

…