diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-02-04 19:59:50 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-02-04 19:59:50 (GMT) |
| commit | 2569d244d4e4ce9b48648599a57196cfbf6f028f (patch) | |
| tree | 63f51d200979aa7206dc082c5ef31a7d7303c18e /includes/defines.h | |
| parent | d21d1f7ba58d1fc2f1b6ccbfc945e440e16a06b7 (diff) | |
| parent | bb3964138cb664b0c9ced741441863bb0c03c556 (diff) | |
| download | powder-2569d244d4e4ce9b48648599a57196cfbf6f028f.zip powder-2569d244d4e4ce9b48648599a57196cfbf6f028f.tar.gz | |
Merge branch 'upstream' into dev
Conflicts:
src/powder.c
Diffstat (limited to 'includes/defines.h')
| -rw-r--r-- | includes/defines.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/defines.h b/includes/defines.h index 9fba0fb..967e3f1 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -8,9 +8,9 @@ #endif #define SAVE_VERSION 46 -#define MINOR_VERSION 0 +#define MINOR_VERSION 1 #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter. -//#define BETA +#define BETA #define SERVER "powdertoy.co.uk" |