Merge branch 'zindex3' into duke
Conflicts: .gitignore
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -159,3 +159,6 @@ src/libcc.so
|
||||
src/cc/customcc.so
|
||||
src/HUSH3_7776
|
||||
REGTEST_7776
|
||||
src/cc/librogue.so
|
||||
src/cc/games/prices
|
||||
src/cc/games/tetris
|
||||
|
||||
Reference in New Issue
Block a user