Lirusaito af67342969 Merge branch 'master' of git://github.com/siana/SingularityViewer ...

Conflicts:
	indra/llrender/llvertexbuffer.cpp
Also, reverts indra/newview/skins/default/xui/en-us/panel_audio.xml to before mute-gesture button (For now can be toggled through SinguMuteGestures debug setting)

2012-03-27 07:15:48 -04:00

..

html

Now we're Vivox license compliant

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

textures

Merge branch 'master' of git://github.com/siana/SingularityViewer

2012-02-29 10:52:26 -05:00

xui

Merge branch 'master' of git://github.com/siana/SingularityViewer

2012-03-27 07:15:48 -04:00

colors_base.xml

Revert "Replace all NotifyCautionBoxColor's and AlertCautionBoxColor's that were using tan with black, like Emerald skin's NotifyCautionBoxColor."

2012-02-20 05:05:57 +01:00

colors.xml

Imported existing code

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