Latif Khalifa 8584e6da4c Merge branch 'master' into meshupload ...

Conflicts:
	indra/llcommon/llhash.h
	indra/newview/CMakeLists.txt
	indra/newview/llfloatermodelpreview.cpp
	indra/newview/llfloatermodelpreview.h
	indra/newview/llpanelprofile.h

2013-01-30 00:36:31 +01:00

..

html

Now we're Vivox license compliant

2011-01-07 17:07:00 +01:00

textures

Mute list, now with 100% more text-appearing-ness, and 20% new shinies (mute-type icons, multi-select unmute, and displayname support).

2012-12-14 16:24:51 -06:00

xui

Merge branch 'master' into meshupload

2013-01-30 00:36:31 +01:00

colors_base.xml

Added colors for mesh upload MeshImportTableNormalColor and MeshImportTableHighlightColor to default/colors_base.xml

2013-01-06 12:46:56 -05:00

colors.xml

Imported existing code

2010-04-02 02:48:44 -03:00