Lirusaito c2cc398339 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate ...

Conflicts(Actually git being dumb, I already merged these, just lost history):
	indra/newview/llfloateractivespeakers.h - local
	indra/newview/lloverlaybar.cpp - local
	indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml - remote

2013-06-25 19:37:50 -04:00

..

html

…

textures

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

xui

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-25 19:37:50 -04:00

colors_base.xml

Fix small copy paste buggy

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

colors.xml

…