Files
SingularityViewer/indra
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
..
2013-05-29 02:37:48 +02:00
2013-05-11 21:46:41 +02:00
2013-05-25 03:19:33 +02:00
2013-03-05 12:24:51 -05:00
2012-12-09 02:10:16 +01:00
2013-05-08 00:55:50 -04:00
2013-03-04 12:02:01 -05:00
2013-05-06 06:07:23 +02:00