Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

Browse Source

...

This commit is contained in:

Sys Quatre

2020-06-16 22:26:41 +02:00

parent 7bcfbbca3a 5aecf5f2c7

commit 5612f4c884

18 changed files with 1225 additions and 168 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

homedecor_common/textures/homedecor_japanese_paper.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 591 B

0

homedecor_common/tools/updatepo.sh Executable file → Normal file