Merge branch 'master' into V2TextureSystem

Browse Source

Conflicts:
	indra/newview/llfloaterexport.cpp

...

This commit is contained in:

Shyotl

2011-04-24 03:31:31 -05:00

parent 2d882e527f 50540049c1

commit 5954e0d71c

33 changed files with 1816 additions and 3725 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

1197

indra/newview/llviewerobjectbackup.cpp Executable file

File diff suppressed because it is too large Load Diff