Solved conflict #1

Browse Source

...

This commit is contained in:

stilobique-surface

2021-05-13 20:30:04 +02:00

parent 87bd230306

commit 5cc53fca02

21 changed files with 1379 additions and 66 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

assets/props/stack gold/materials/MA_gold.material

BIN

Binary file not shown.

assets/props/stack gold/sm_stackgold.mesh

BIN

Binary file not shown.