Merge branch 'dev' into FSM

# Conflicts: # src/assetchains.old
2019-03-13 22:55:52 -11:00
parent 912cecf630 0fe3a71428
commit e713c31ada
5 changed files with 14 additions and 7 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