Files
SingularityViewer/indra/newview/skins/default/xui
Siana Gearz f30c284063 Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
Conflicts:
	indra/llvfs/lldiriterator.cpp
	indra/newview/app_settings/settings.xml
	indra/newview/llviewerregion.cpp
2011-07-21 00:20:06 +02:00
..