Merge git://github.com/AlericInglewood/SingularityViewer

Conflicts:
	indra/newview/CMakeLists.txt
	indra/newview/app_settings/settings.xml
This commit is contained in:
Siana Gearz
2011-05-01 22:55:18 +02:00
83 changed files with 39297 additions and 39235 deletions

File diff suppressed because it is too large Load Diff