Merge branch 'master' of github.com:teamfisk/VstyleR

Browse Source

Conflicts:
	Assets/Materials/M_Glass.mat

...

This commit is contained in:

sippeangelo

2016-05-27 01:53:55 +02:00

parent 24a02f9abc 72f80fd838

commit 3efd2a4018

76 changed files with 4119 additions and 20 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

ProjectSettings/GraphicsSettings.asset

BIN

Binary file not shown.