Files
SingularityViewer/indra
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
..
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
2013-05-08 00:55:50 -04:00
2013-03-04 12:02:01 -05:00
2013-05-06 06:07:23 +02:00