Merge branch 'upstream' into dev

Conflicts:
	src/main.c
This commit is contained in:
jacksonmj
2011-02-22 15:18:04 +00:00
6 changed files with 155 additions and 114 deletions

View File

@@ -8,9 +8,9 @@
#endif
#define SAVE_VERSION 46
#define MINOR_VERSION 1
#define MINOR_VERSION 3
#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"