merge merge merge

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
 
@@ -16,6 +16,8 @@
 
 #define THUMB_CACHE_SIZE 256
 
+//#define pyconsole
+
 #define IMGCONNS 3
 #define TIMEOUT 100
 #define HTTP_TIMEOUT 10
@@ -65,6 +67,8 @@ extern unsigned char ZSIZE;
 #define SQUARE_BRUSH 1
 #define BRUSH_NUM 2
 
+#define PYCONSOLE
+
 #ifdef PIX16
 typedef unsigned short pixel;
 #else