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

Browse Source

Fixed pipeline conflict over Mika/Shyotl variable naming differences.

...

This commit is contained in:

Lirusaito

2017-03-20 08:08:06 -04:00

parent aee659b518 1ccd8cfd89

commit 8e59d9800d

212 changed files with 3066 additions and 3697 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

579

indra/newview/pipeline.cpp

File diff suppressed because it is too large Load Diff