Merge branch 'devel'

Browse source

...

This commit is contained in:

Marisa the Magician 2019-05-03 17:27:25 +02:00

parent 2885540fb1 4caa5e097e

commit c3c41a509d

593 changed files with 225 additions and 26 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

BIN

models/barrel4M_a.3d Normal file

View file

Binary file not shown.

BIN

models/barrel4M_d.3d Normal file

View file

Binary file not shown.

BIN

models/jbarrel4.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 56 KiB