Merge branch 'master' into feature/localization

au2010 · Jul 25, 2024 · 7a67324 · 7a67324
2 parents 1ad1479 + 8b2b992
commit 7a67324
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/install/win32/FlameRobinSetup.iss b/install/win32/FlameRobinSetup.iss
@@ -56,7 +56,7 @@ LicenseFile=..\..\docs-src\fr_license.txt
 InfoBeforeFile=info_before_win64.rtf
 #endif
 InfoAfterFile=
-MinVersion=0,6.0
+MinVersion=0,6.1
 #ifdef DEBUG
 Compression=lzma/ultra
 #ifdef X64VERSION

diff --git a/src/frversion.h b/src/frversion.h
@@ -1,6 +1,6 @@
 #define FR_VERSION_MAJOR    0
 #define FR_VERSION_MINOR    9
-#define FR_VERSION_RLS      10
+#define FR_VERSION_RLS      11
 
 // if this file can't be found you need to run the update-revision-info script
 #include "revisioninfo.h"