Files
SingularityViewer/indra/newview/skins
Siana Gearz 09d37d7dfd Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
Conflicts:
	indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
2012-01-13 19:18:22 +01:00
..