Shyotl e8ce35ebf8 Merge branch 'master' into UICleanup ...

Conflicts:
	indra/llcommon/llstl.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llfloateranimpreview.cpp
	indra/newview/llfloateranimpreview.h
	indra/newview/llfloaterperms.cpp
	indra/newview/llfloaterproperties.cpp
	indra/newview/llpanelpermissions.cpp
	indra/newview/llviewermenu.cpp

2013-05-03 21:41:51 -05:00

..

html

Now we're Vivox license compliant

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

textures

Merge remote-tracking branch 'upstream/release'

2013-04-09 19:52:13 +02:00

xui

Merge branch 'master' into UICleanup

2013-05-03 21:41:51 -05:00

colors_base.xml

Fix small copy paste buggy

2013-03-12 00:59:24 -04:00

colors.xml

Imported existing code

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