Merge branch 'master' into linux

This commit is contained in:
2017-01-30 14:01:01 -05:00
523 changed files with 180920 additions and 934 deletions

3
.gitignore vendored
View File

@@ -78,6 +78,9 @@ test/junk/*.xml
test/junk/*.spec
test/junk/*.map
# Packed scenarios
*.boes
# Misc
*~
oldstructs.txt