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

Browse Source

# Conflicts:
#	indra/llcommon/llstring.h
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerregion.cpp

...

This commit is contained in:

Lirusaito

2019-03-18 17:30:34 -04:00

parent d235e045d8 e0194d4d06

commit c5329968f7

101 changed files with 7625 additions and 2526 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

1470

indra/newview/llviewerobject.cpp

File diff suppressed because it is too large Load Diff