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

Browse Source

Conflicts:
	indra/llrender/llshadermgr.cpp
	indra/newview/llmorphview.cpp
	indra/newview/lltexlayer.cpp
	indra/newview/lltexlayer.h
	indra/newview/lltoolmorph.cpp
	indra/newview/llvoavatar.cpp
	indra/newview/llvoavatar.h

...

This commit is contained in:

Siana Gearz

2012-01-06 14:18:46 +01:00

parent b911e86b02 6381e4d9a4

commit 8e19372adf

35 changed files with 3377 additions and 3609 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

1790

indra/newview/lltexlayer.cpp

File diff suppressed because it is too large Load Diff