summaryrefslogtreecommitdiff
path: root/includes/defines.h
diff options
context:
space:
mode:
authorjacksonmj <jacksonmj@jacksonmj.none>2011-01-11 13:44:52 (GMT)
committer jacksonmj <jacksonmj@jacksonmj.none>2011-01-11 13:44:52 (GMT)
commit4006bdf4c22564e916092d6d63ae63d1fa6bc5b5 (patch)
tree5cbe9ad22685a055f4d7849bd52afa0f9ab87f8d /includes/defines.h
parentcf1ef725847a5dc5c9e796a10ff840f65dc1e885 (diff)
parentb3735bb84b5d53014e7e20085007ef380cc7a3c1 (diff)
downloadpowder-4006bdf4c22564e916092d6d63ae63d1fa6bc5b5.zip
powder-4006bdf4c22564e916092d6d63ae63d1fa6bc5b5.tar.gz
Merge branch 'upstream' into dev
Diffstat (limited to 'includes/defines.h')
-rw-r--r--includes/defines.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/defines.h b/includes/defines.h
index d35888f..1c502fe 100644
--- a/includes/defines.h
+++ b/includes/defines.h
@@ -8,9 +8,9 @@
#endif
#define SAVE_VERSION 45
-#define MINOR_VERSION 0
+#define MINOR_VERSION 2
#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"