Files
SingularityViewer/indra/newview/app_settings
Siana Gearz cd2dc2f3ca Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/app_settings/settings.xml
	indra/newview/llface.cpp
2012-07-03 07:49:22 +02: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