Merge branch 'beta' into dev

# Conflicts: # src/assetchains.old
2019-03-13 22:54:11 -11:00
parent b1a3104786
commit 0fe3a71428
5 changed files with 25 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -126,3 +126,19 @@ src/komodo-tx.exe


 src/cryptoconditions/compile
+
+src/checkfile
+
+src/foo.zip
+
+src/log
+
+src/rogue.530623577502174316.0
+
+src/rogue.530623577502174316.pack
+
+src/rogue.530623577502174316.player
+
+src/ROGUE.conf
+
+src/rogue.scr