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

Browse Source

Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/app_settings/settings.xml
	indra/newview/llface.cpp

...

This commit is contained in:

Siana Gearz

2012-07-03 07:49:22 +02:00

parent f38e8b1981 9ddbc132bf

commit cd2dc2f3ca

170 changed files with 8686 additions and 5913 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

1187

indra/newview/llface.cpp

File diff suppressed because it is too large Load Diff