From 5d8c61e41011a8106359343243e1050af4e7fd1f Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Tue, 8 Jan 2019 22:34:04 +0100 Subject: [PATCH] prepare v2.6 release --- doc/README.txt | 6 ++++++ install/WinInstaller.nsi | 2 +- src/English.lproj/InfoPlist.strings | Bin 654 -> 660 bytes src/buttons.c | 2 +- src/gfx2.rc | 10 +++++----- src/helpfile.h | 2 +- src/pversion.c | 2 +- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/doc/README.txt b/doc/README.txt index f7c2e28b..e3549c2b 100644 --- a/doc/README.txt +++ b/doc/README.txt @@ -80,6 +80,12 @@ Sends greetings and glops to pouet.net : http://pouet.net/prod.php?which=51865 === HISTORY === Short revision history : + * 01/2019 2.6 SDL2/X11/win32 GDI support in addition to SDL1.2.x + Many more "8bits" computer constraints modes + Support for more C64 pictures formats + Support for Thomson file formats + Open URL when clicking them in oneline help + Brush and picture copy/paste support * 05/2017 2.5 Support for several new file formats. CPC, ZX and Thomson constraints modes. * 10/2012 2.4 Animation diff --git a/install/WinInstaller.nsi b/install/WinInstaller.nsi index bc7a2627..864d981a 100644 --- a/install/WinInstaller.nsi +++ b/install/WinInstaller.nsi @@ -1,7 +1,7 @@ ;NSIS Modern User Interface ;Based on the Example Script written by Joost Verburg -!define VERSION 2.5.1946 +!define VERSION 2.6.2472 !define API sdl !define FREETYPEDLL libfreetype-6.dll diff --git a/src/English.lproj/InfoPlist.strings b/src/English.lproj/InfoPlist.strings index 58a2c748fdfb086094a6d7072ccfa68fbe579996..22e6260bbb388d057da37701420c0facc2a2e981 100644 GIT binary patch delta 41 ucmeBUox(cdEvFfS9)l5s34{5>53!79ll>Sq87(LCF&R%@&6oscH2?tX0}A2* delta 39 scmbQj+Q&NKEwd4W-o$UQtOg7^3<{IqF{(0JOs->`3MP#wyEFL$0P`^mpa1{> diff --git a/src/buttons.c b/src/buttons.c index c55648f5..36e3d4f2 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -164,7 +164,7 @@ void Button_Message_initial(void) for (x=14,x_pos=0; x_pos<231; x_pos++,x++) Pixel_in_window(x,y,Gfx->Logo_grafx2[offs_y+x_pos]); - Print_in_window(130-4*26,88,"Copyright (c) 2007-2018 by",MC_Dark,MC_Light); + Print_in_window(130-4*26,88,"Copyright (c) 2007-2019 by",MC_Dark,MC_Light); Print_in_window(130-4*23,100,"the Grafx2 project team",MC_Black,MC_Light); Print_in_window(130-4*26,112,"Copyright (c) 1996-2001 by",MC_Dark,MC_Light); Print_in_window(130-4*13,122,"Sunset Design",MC_Black,MC_Light); diff --git a/src/gfx2.rc b/src/gfx2.rc index 42975207..89402c43 100644 --- a/src/gfx2.rc +++ b/src/gfx2.rc @@ -5,8 +5,8 @@ #endif 1 VERSIONINFO -FILEVERSION 2,6,0,2100 -PRODUCTVERSION 2,6,0,2100 +FILEVERSION 2,6,0,2472 +PRODUCTVERSION 2,6,0,2472 FILEFLAGSMASK VS_FF_DEBUG #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -20,12 +20,12 @@ BEGIN BEGIN VALUE "CompanyName", "The GrafX2 Team" VALUE "FileDescription", "The ultimate 256-color painting programm" - VALUE "FileVersion", "2.6wip2100" + VALUE "FileVersion", "2.6.2472" VALUE "InternalName", "grafx2" - VALUE "LegalCopyright", "(c) 2007-2018 The GrafX2 Team, (c) 1996-2001 Sunset Design" + VALUE "LegalCopyright", "(c) 2007-2019 The GrafX2 Team, (c) 1996-2001 Sunset Design" VALUE "OriginalFilename", "grafx2.exe" VALUE "ProductName", "GrafX2" - VALUE "ProductVersion", "2.6wip2100" + VALUE "ProductVersion", "2.6.2472" END END BLOCK "VarFileInfo" diff --git a/src/helpfile.h b/src/helpfile.h index a87bfe59..9aa6afd8 100644 --- a/src/helpfile.h +++ b/src/helpfile.h @@ -65,7 +65,7 @@ static const T_Help_table helptable_about[] = HELP_TEXT ("") HELP_TEXT (" http://grafx2.tk") HELP_TEXT ("") - HELP_TEXT ("Copyright 2007-2018, the Grafx2 project team") + HELP_TEXT ("Copyright 2007-2019, the Grafx2 project team") HELP_TEXT (" 1996-2001, SUNSET DESIGN") }; static const T_Help_table helptable_licence[] = diff --git a/src/pversion.c b/src/pversion.c index 3cda900a..6e2411a2 100644 --- a/src/pversion.c +++ b/src/pversion.c @@ -1 +1 @@ -const char Program_version[]="2.6wip"; +const char Program_version[]="2.6";