The death of the unstable branch

src/game/game_init.c

@@ -30,11 +30,7 @@
 // FIXME: I'm not sure all of these variables belong in this file, but I don't
 // know of a good way to split them
 
-#ifdef UNSTABLE_BRANCH
 struct Controller gControllers[MAX_PLAYERS];
-#else
-struct Controller gControllers[3];
-#endif
 struct SPTask *gGfxSPTask;
 Gfx *gDisplayListHead;
 u8 *gGfxPoolEnd;

src/game/game_init.h

@@ -22,11 +22,7 @@ struct DemoInput
     u8 buttonMask;
 };
 
-#ifdef UNSTABLE_BRANCH
 extern struct Controller gControllers[MAX_PLAYERS];
-#else
-extern struct Controller gControllers[3];
-#endif
 extern OSContStatus gControllerStatuses[4];
 extern OSContPad gControllerPads[4];
 extern OSMesgQueue gGameVblankQueue;

src/pc/network/version.c

@@ -3,11 +3,7 @@
 #include "types.h"
 
 static char sVersionString[MAX_VERSION_LENGTH] = { 0 };
-#ifdef UNSTABLE_BRANCH
-#define VERSION_TEXT "unst "
-#else
 #define VERSION_TEXT "beta "
-#endif
 
 char* get_version(void) {
     snprintf(sVersionString, MAX_VERSION_LENGTH, "%s%d.%d", VERSION_TEXT, VERSION_NUMBER, MINOR_VERSION_NUMBER);

src/pc/network/version.h

@@ -1,7 +1,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define UNSTABLE_BRANCH
 #define VERSION_NUMBER 27
 #define MINOR_VERSION_NUMBER 0