Merge branch 'FSM' into jl777

2019-03-13 22:56:40 -11:00
parent 5ac1415bf9 e713c31ada
commit 7f5ca7d6a4
6 changed files with 24 additions and 17 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -132,6 +132,11 @@ src/cc/rogue/rogue
 src/cc/rogue/rogue.so

 src/cc/rogue/test.zip
+src/checkfile
+
+src/foo.zip
+
+src/log

 src/rogue.530623577502174316.0

@@ -139,11 +144,6 @@ src/rogue.530623577502174316.pack

 src/rogue.530623577502174316.player

-src/checkfile
-
-src/log
-
-src/foo.zip

 src/cc/rogue/config.h