diff --git a/README.txt b/README.txt index 089ba320d9..c0c761123d 100644 --- a/README.txt +++ b/README.txt @@ -11,6 +11,11 @@ Issue Tracker is found here: www.github.com/smeighan/xLights/issues XLIGHTS/NUTCRACKER RELEASE NOTES --------------------------------- +2020.26 June 23 2020 + -- enh (scott) Add drop down for accessing buffer presets + -- enh (scott) Prevent users opening core xml files as sequences + -- bug (dkulp) Fix crash in OSX hardware video decoding + -- bug (keith) Try again to fix hangs relating to model list select dialog 2020.25 June 21 2020 -- enh (dkulp) Add "Virtual Matrix" as FPP controller type -- enh (dkulp) "Discover" will now discover FPP instances used as Virtual Matrix diff --git a/build_scripts/msw/xLights_common.iss b/build_scripts/msw/xLights_common.iss index 73e921ca94..d5a4384cde 100644 --- a/build_scripts/msw/xLights_common.iss +++ b/build_scripts/msw/xLights_common.iss @@ -3,5 +3,5 @@ #define MyTitleName "xLights" #define Year 2020 -#define Version 25 +#define Version 26 #define Other "" diff --git a/xLights/xLightsVersion.h b/xLights/xLightsVersion.h index 8ef2a0b22e..9a7c4bf3a4 100644 --- a/xLights/xLightsVersion.h +++ b/xLights/xLightsVersion.h @@ -15,10 +15,10 @@ #if __has_include("xlights_build_version.h") #include "xlights_build_version.h" #else -static const wxString xlights_version_string = "2020.25"; +static const wxString xlights_version_string = "2020.26"; #endif static const wxString xlights_qualifier = ""; // " BETA,ALPHA,PROD"; -static const wxString xlights_build_date = "June 21, 2020"; +static const wxString xlights_build_date = "June 23, 2020"; const wxString &GetBitness(); wxString GetDisplayVersionString();