Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Browse Source

Conflicts:
	indra/newview/lldynamictexture.cpp

...

This commit is contained in:

Siana Gearz

2012-03-31 01:54:53 +02:00

parent 29e308b5ca e7bcf1e9ec

commit 7774fe7f04

17 changed files with 752 additions and 757 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

901

indra/newview/llstartup.cpp

File diff suppressed because it is too large Load Diff