Merge branch 'linux' into merge_linux

This commit is contained in:
Michael Bonfils
2018-02-08 20:36:46 +01:00
128 changed files with 1618 additions and 29 deletions

1
.gitignore vendored
View File

@@ -82,6 +82,7 @@ test/junk/*.map
*.boes
# Misc
*~
oldstructs.txt
src/tools/gitrev.hpp
rsrc/**/scenario