Files
SingularityViewer/indra/newview/skins/default/xui/es
Lirusaito 3739639295 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
Conflicts:
	indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel
	indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two.

Compile fixies:
	indra/newview/llavataractions.cpp needed to include llnotifications.h
	indra/newview/llvoicechannel.cpp needed to include llnotifications.h
2013-06-23 22:36:04 -04:00
..
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2013-03-03 09:58:02 -05:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2013-03-03 09:58:02 -05:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-08-13 02:23:08 +02:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-12-19 23:29:36 -03:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-16 17:07:22 -04:00
2012-07-18 15:30:03 -03:00
2012-07-13 06:23:37 -03:00
2012-07-18 15:30:03 -03:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-03-03 09:58:02 -05:00
2013-04-16 00:25:59 -05:00
2012-07-13 06:23:37 -03:00
2012-07-13 06:23:37 -03:00
2012-07-13 06:23:37 -03:00
2012-07-13 06:23:37 -03:00
2012-07-13 06:23:37 -03:00
2012-07-16 17:07:22 -04:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-03-03 09:58:02 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2012-07-16 17:07:22 -04:00
2013-05-29 23:56:33 -04:00
2012-08-13 02:23:08 +02:00
2012-07-13 06:23:37 -03:00