Merge branch '3d-models'
Conflicts: .gitignore
This commit is contained in:
commit
f94f97b52b
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,7 +1,5 @@
|
||||||
*.bak
|
*.bak
|
||||||
*.bck
|
*.bck
|
||||||
*.wings~
|
*.wings~
|
||||||
*~
|
|
||||||
**~
|
|
||||||
**pretty
|
**pretty
|
||||||
/pretty
|
/pretty
|
Loading…
Reference in a new issue