From 3cc0524ca5f135c3aa02e9940ae3a0b510632d4a Mon Sep 17 00:00:00 2001 From: Max Golovanov Date: Thu, 9 Jan 2020 14:33:41 -0800 Subject: [PATCH 1/2] Build break on Linux due to ^M in Version.hpp . We had CI down for the last 2 days, this doesn't break on Windows compiler, but breaks on Linux gcc --- lib/include/public/Version.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/include/public/Version.hpp b/lib/include/public/Version.hpp index f02c3ef66..8349e7752 100644 --- a/lib/include/public/Version.hpp +++ b/lib/include/public/Version.hpp @@ -3,8 +3,8 @@ #define MAT_VERSION_HPP // WARNING: DO NOT MODIFY THIS FILE! // This file has been automatically generated, manual changes will be lost. -#define BUILD_VERSION_STR "3.3.8.1 " -#define BUILD_VERSION 3,3,8,1 +#define BUILD_VERSION_STR "3.3.8.1" +#define BUILD_VERSION 3,3,8,1 #ifndef RESOURCE_COMPILER_INVOKED #include From 2446fd472445b7345a962739b885cd68a2a082bc Mon Sep 17 00:00:00 2001 From: Max Golovanov Date: Thu, 9 Jan 2020 14:45:11 -0800 Subject: [PATCH 2/2] Remove CRLF from version.txt - scripts don't like that.. --- Solutions/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Solutions/version.txt b/Solutions/version.txt index 24b4a38da..879198eb9 100644 --- a/Solutions/version.txt +++ b/Solutions/version.txt @@ -1 +1 @@ -3.3.999.1 +3.3.999.1 \ No newline at end of file