Merge branch '3d-models'

Conflicts:
	.gitignore
This commit is contained in:
Oliver Walters 2015-10-28 10:03:34 +11:00
commit f94f97b52b
1 changed files with 0 additions and 2 deletions

2
.gitignore vendored
View File

@ -1,7 +1,5 @@
*.bak
*.bck
*.wings~
*~
**~
**pretty
/pretty