Merge branch 'merge_linux' of https://github.com/murlock/cboe

2018-03-03 17:52:59 -05:00
parent a0b61c1065 12c3ce26f8
commit 9073063423
127 changed files with 1629 additions and 27 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -88,6 +88,7 @@ test/junk/*.map
 *.boes

 # Misc
+*~
 oldstructs.txt
 src/tools/gitrev.hpp
 rsrc/**/scenario