From 5b17c0779b72de7d34ec25d94e9e13287e646ca0 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Tue, 2 Jul 2013 15:46:31 -0500 Subject: [PATCH 1/2] Version 2.7.1 --- src/version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/version.h b/src/version.h index 4b6dc14a7..6f23d89fd 100644 --- a/src/version.h +++ b/src/version.h @@ -41,11 +41,11 @@ const char *GetVersionString(); /** Lots of different version numbers **/ -#define VERSIONSTR "2.7.0" +#define VERSIONSTR "2.7.1" // The version as seen in the Windows resource -#define RC_FILEVERSION 2,7,0,0 -#define RC_PRODUCTVERSION 2,7,0,0 +#define RC_FILEVERSION 2,7,1,0 +#define RC_PRODUCTVERSION 2,7,1,0 #define RC_PRODUCTVERSION2 "2.7" // Version identifier for network games. From 80a3e4f902281c22d53cca78048e9ae559b2fd6e Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Wed, 3 Jul 2013 01:58:13 -0400 Subject: [PATCH 2/2] - Fixed: Cocoa IWAD picker needed to be updated to handle git version strings. --- src/sdl/iwadpicker_cocoa.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdl/iwadpicker_cocoa.mm b/src/sdl/iwadpicker_cocoa.mm index 1a1fa8b8c..a0469ac7a 100644 --- a/src/sdl/iwadpicker_cocoa.mm +++ b/src/sdl/iwadpicker_cocoa.mm @@ -156,7 +156,7 @@ static const char* const tableHeaders[NUM_COLUMNS] = { "IWAD", "Game" }; cancelled = false; app = [NSApplication sharedApplication]; - id windowTitle = [NSString stringWithUTF8String:GAMESIG " " DOTVERSIONSTR ": Select an IWAD to use"]; + id windowTitle = [NSString stringWithFormat:@GAMESIG " %s: Select an IWAD to use", GetVersionString()]; NSRect frame = NSMakeRect(0, 0, 440, 450); window = [[NSWindow alloc] initWithContentRect:frame styleMask:NSTitledWindowMask backing:NSBackingStoreBuffered defer:NO];