Siana Gearz 9c1e74b0c0 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer ...

Conflicts:
	indra/llaudio/llstreamingaudio_fmodex.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml

2012-07-23 03:04:33 +02:00

..

html

…

textures

Added icons for folders from phoenix, and created outbox folder icon for future use.

2012-07-18 20:26:19 -04:00

xui

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

2012-07-23 03:04:33 +02: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

…