Merge branch 'master' into beta

2019-05-22 22:05:20 -11:00
parent 581b6411d6 cf81bdb5f6
commit 12a3d56205
1 changed files with 1 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -132,6 +132,7 @@ src/cc/rogue/rogue
 src/cc/rogue/rogue.so

 src/cc/rogue/test.zip
+src/cc/dapps/a.out
 src/checkfile

 src/foo.zip
@@ -145,8 +146,6 @@ src/rogue.530623577502174316.pack
 src/rogue.530623577502174316.player


-src/cc/rogue/config.h
-
 src/cc/rogue/config.h

 src/ROGUE.conf