Latif Khalifa 303840f729 Merge remote-tracking branch 'shyotl/sunshine' ...

Conflicts:
	indra/llappearance/llavatarappearance.cpp
	indra/newview/character/avatar_lad.xml
	indra/newview/llagent.cpp

2013-03-26 23:54:36 +01:00

..

html

Now we're Vivox license compliant

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

textures

Add Pathfinding UI from v3

2013-03-08 03:17:11 -05:00

xui

Merge remote-tracking branch 'shyotl/sunshine'

2013-03-26 23:54:36 +01:00

colors_base.xml

Fix small copy paste buggy

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

colors.xml

…