Files
SingularityViewer/indra/newview/app_settings
Shyotl a6a69caa4f Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp
2012-02-24 13:21:59 -06:00
..
2011-12-02 10:41:53 -05:00
2010-04-02 02:48:44 -03:00
2011-03-01 06:21:21 +01:00
2011-04-30 22:00:12 +02: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