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

Browse Source

Conflicts:
	indra/newview/llpaneldisplay.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml

...

This commit is contained in:

Siana Gearz

2011-06-05 19:56:46 +02:00

parent 1473486f23 50ce0c4183

commit 630059a74f

587 changed files with 27725 additions and 13002 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

1718

indra/newview/llviewermenu.cpp

File diff suppressed because it is too large Load Diff