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

Browse Source

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

parent a8f4b3ed4a 26c40255aa

commit 38849c1328

83 changed files with 39297 additions and 39235 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

28296

indra/newview/app_settings/settings.xml

File diff suppressed because it is too large Load Diff