Files
SingularityViewer/indra/newview/app_settings
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-03-05 10:17:08 -05:00
2010-04-02 02:48:44 -03:00
2011-03-01 06:21:21 +01:00
2012-07-03 07:51:03 +02:00
2012-07-16 19:33:44 -04:00
2013-05-11 22:36:46 -04:00
2010-04-02 02:48:44 -03:00
2010-11-17 03:51:58 -06:00
2010-04-02 02:48:44 -03:00