summaryrefslogtreecommitdiff
path: root/includes/defines.h
diff options
context:
space:
mode:
authorjacksonmj <jacksonmj@jacksonmj.none>2011-01-30 22:31:39 (GMT)
committer jacksonmj <jacksonmj@jacksonmj.none>2011-01-30 22:36:15 (GMT)
commitf97990fedd034e013d27bfb83a6196ab0d4c9a66 (patch)
treea3550252ba2f47f62e48f6f3ac82fe13f7a63fb1 /includes/defines.h
parent5d34cae2e48938aaeebb44786e164bc3c7d94a43 (diff)
parentbcbcb0063b1f3451b4e329b69d275bcabadc788a (diff)
downloadpowder-f97990fedd034e013d27bfb83a6196ab0d4c9a66.zip
powder-f97990fedd034e013d27bfb83a6196ab0d4c9a66.tar.gz
Merge branch 'upstream' into dev
Diffstat (limited to 'includes/defines.h')
-rw-r--r--includes/defines.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/includes/defines.h b/includes/defines.h
index b6df689..2057fe0 100644
--- a/includes/defines.h
+++ b/includes/defines.h
@@ -139,6 +139,7 @@ int gol[XRES][YRES];
int gol2[XRES][YRES][NGOL+1];
int SEC;
int SEC2;
+int console_mode;
int REPLACE_MODE;
int CURRENT_BRUSH;
int GRID_MODE;