1
0
Fork 0

Merge remote-tracking branch 'origin/Graphics'

This commit is contained in:
Saibotk 2018-04-22 10:23:25 +02:00
commit 732a2ebf68
5 changed files with 3 additions and 1 deletions

2
.gitignore vendored
View file

@ -34,3 +34,5 @@ sysinfo.txt
*.unitypackage *.unitypackage
Assets/graphics/textures/tmp/Thumbs\.db Assets/graphics/textures/tmp/Thumbs\.db
Thumbs\.db

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 1fa1a8e153b3443439cea0e1f983f2a6 guid: ddc6452a517b6824b9195f30b422202a
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}