Merge branch '3d-models'

Conflicts:
	.gitignore
This commit is contained in:
Oliver Walters 2015-10-28 11:55:19 +11:00
commit f8451d9786
355 changed files with 1 additions and 898295 deletions

2
.gitignore vendored
View File

@ -2,4 +2,4 @@
*.bck
*.wings~
**pretty
/pretty
/pretty

Some files were not shown because too many files have changed in this diff Show More