diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-26 19:32:51 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-26 19:32:51 (GMT) |
| commit | ded7bdf30d87601e125ce06fee0a6614cd424f73 (patch) | |
| tree | 9b9004facb67d6276e9a2c8f6c79449834c5a229 /includes/defines.h | |
| parent | a972644c4ffda6774ecea2798ff6d76f09d8f04e (diff) | |
| parent | 669a672b3d083af22c6aeb37a636903ce30bcf6c (diff) | |
| download | powder-ded7bdf30d87601e125ce06fee0a6614cd424f73.zip powder-ded7bdf30d87601e125ce06fee0a6614cd424f73.tar.gz | |
Merge branch 'upstream' into dev
Conflicts:
src/main.c
Diffstat (limited to 'includes/defines.h')
| -rw-r--r-- | includes/defines.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/defines.h b/includes/defines.h index f7f4593..898edaf 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -8,7 +8,7 @@ #endif #define SAVE_VERSION 46 -#define MINOR_VERSION 3 +#define MINOR_VERSION 4 #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter. //#define BETA |