Files
SingularityViewer/indra/newview/app_settings
Lirusaito fd453593b3 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
Conflicts:
	indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
	indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
	indra/newview/llfloaterobjectiminfo.cpp - simple merge
	indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
	indra/newview/llviewermedia.cpp - includes conflict, simple stuff.

SLURL update:
	indra/newview/llavataractions.cpp
	indra/newview/llgroupactions.cpp
2013-06-11 15:32:18 -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