Merge branch 'upstream' into dev

This commit is contained in:
jacksonmj
2011-01-30 22:31:39 +00:00
7 changed files with 459 additions and 27 deletions

View File

@@ -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;