baleeted the old tag

code/hud/hudwingmanstatus.cpp

@@ -279,23 +279,6 @@ int HUD_wingman_right_coords[GR_NUM_RESOLUTIONS][5][2] = {
 	}
 };
 
-// special coordinates if only one wing is present
-int HUD_wingman_status_single_coords[GR_NUM_RESOLUTIONS][4][2] = 
-{
-	{ // GR_640
-		{589,159},				// where to draw dots 1 - 4 if we have only one wing present (special case)
-		{582,167},
-		{596,167},
-		{589,175},
-	}, 
-	{ // GR_1024
-		{971,159},
-		{964,167},
-		{978,167},
-		{971,175},
-	}
-};
-
 int HUD_wingman_status_name_coords[GR_NUM_RESOLUTIONS][MAX_SQUADRON_WINGS][2] =
 {
 	{ // GR_640
@@ -314,6 +297,27 @@ int HUD_wingman_status_name_coords[GR_NUM_RESOLUTIONS][MAX_SQUADRON_WINGS][2] =
 	}
 };
 
+// special coordinates if only one wing is present
+int HUD_wingman_status_single_coords[GR_NUM_RESOLUTIONS][MAX_SHIPS_PER_WING][2] = 
+{
+	{ // GR_640
+		{589,159},				// where to draw dots if we have only one wing present (special case)
+		{582,167},
+		{596,167},
+		{589,175},
+		{578,175},
+		{600,175},
+	}, 
+	{ // GR_1024
+		{971,159},
+		{964,167},
+		{978,167},
+		{971,175},
+		{960,175},
+		{982,175},
+	}
+};
+
 int HUD_wingman_status_coords[GR_NUM_RESOLUTIONS][MAX_SQUADRON_WINGS][MAX_SHIPS_PER_WING][2] = 
 {
 	// we will only ever display up to 5 wings

code/mission/missionbriefcommon.cpp

@@ -1916,6 +1916,12 @@ ubyte brief_return_color_index(char c)
 		case 'b':
 			return BRIEF_TEXT_BLUE;
 
+ 		case 'w':
+ 			return BRIEF_TEXT_WHITE;
+ 
+ 		case 'y':
+ 			return BRIEF_TEXT_YELLOW;
+ 
 		default:	
 			Int3();	// unsupported meta-code
 			break;

code/ship/ship.cpp

@@ -3579,6 +3579,14 @@ int parse_ship_values(ship_info* sip, bool isTemplate, bool first_time, bool rep
 	{
 		if(optional_string("+Max Glide Speed:"))
 			stuff_float(&sip->glide_cap );
+		
+		// 3.6.9 had one set of behaviour for glide acceleration. This was later changed in 3.6.10 and will be changed back again in 
+		// 3.6.11 and will require the following table entry for the 3.6.10 behaviour. In order to preserve compatibility with the 
+		// upcoming change, 3.6.10 builds should be able to parse the entry, even if they don't do anything with it.
+		if(optional_string("+Glide Accel Mult:")) {
+			float dummy; 
+			stuff_float(&dummy);
+		}
 	}
 
 	if(optional_string("$Autoaim FOV:"))