[Scummvm-git-logs] scummvm-tools branch-2-6-0 -> add669ce74741214521d8af488d26526cb8cb2c6

[lotharsm]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
add669ce74 RELEASE: This is 2.6.0


Commit: add669ce74741214521d8af488d26526cb8cb2c6
    https://github.com/scummvm/scummvm-tools/commit/add669ce74741214521d8af488d26526cb8cb2c6
Author: Lothar Serra Mari (mail at serra.me)
Date: 2022-07-17T00:32:16+02:00

Commit Message:
RELEASE: This is 2.6.0

Changed paths:
    dists/macosx/Info.plist
    dists/scummvmtools.rc
    dists/win32/ScummVM Tools.iss
    dists/win32/scummvm-tools.nsi
    internal_version.h


diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index bca1974f..f41685e0 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>scummvm-tools</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.6.0git, Copyright 2001-2022 The ScummVM team</string>
+	<string>2.6.0, Copyright 2001-2022 The ScummVM team</string>
 	<key>CFBundleIconFile</key>
 	<string>scummvmtools.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -21,9 +21,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.0git</string>
+	<string>2.6.0</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.0git</string>
+	<string>2.6.0</string>
 	<key>NSAppleScriptEnabled</key>
 	<false/>
 	<key>NSHumanReadableCopyright</key>
diff --git a/dists/scummvmtools.rc b/dists/scummvmtools.rc
index 08f2a8eb..2d5ff287 100644
--- a/dists/scummvmtools.rc
+++ b/dists/scummvmtools.rc
@@ -28,13 +28,13 @@ BEGIN
         BEGIN
             VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
             VALUE "FileDescription", "https://www.scummvm.org/\0"
-            VALUE "FileVersion", "2.6.0git\0"
+            VALUE "FileVersion", "2.6.0\0"
             VALUE "InternalName", "scummvm\0"
             VALUE "LegalCopyright", "Copyright © 2001-2022 The ScummVM Team\0"
             VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
             VALUE "OriginalFilename", "scummvm-tools.exe\0"
             VALUE "ProductName", "ScummVM Tools\0"
-            VALUE "ProductVersion", "2.6.0git\0"
+            VALUE "ProductVersion", "2.6.0\0"
         END
     END
 
diff --git a/dists/win32/ScummVM Tools.iss b/dists/win32/ScummVM Tools.iss
index 3d6168a4..7bff2902 100755
--- a/dists/win32/ScummVM Tools.iss	
+++ b/dists/win32/ScummVM Tools.iss	
@@ -1,7 +1,7 @@
 [Setup]
 AppCopyright=2022
 AppName=ScummVM Tools
-AppVerName=ScummVM Tools Git
+AppVerName=ScummVM Tools 2.6.0
 AppPublisher=The ScummVM Team
 AppPublisherURL=https://www.scummvm.org/
 AppSupportURL=https://www.scummvm.org/
diff --git a/dists/win32/scummvm-tools.nsi b/dists/win32/scummvm-tools.nsi
index 92f3170a..433ac212 100644
--- a/dists/win32/scummvm-tools.nsi
+++ b/dists/win32/scummvm-tools.nsi
@@ -60,7 +60,7 @@ Name "ScummVM Tools"
 # General Symbol Definitions
 #########################################################################################
 !define REGKEY      "Software\ScummVM\$(^Name)"
-!define VERSION     "2.6.0git"
+!define VERSION     "2.6.0"
 !define COMPANY     "ScummVM Team"
 !define URL         "https://www.scummvm.org/"
 !define DESCRIPTION "ScummVM Tools Installer. Look! A three headed monkey (TM)!"
diff --git a/internal_version.h b/internal_version.h
index 393596cd..d0a1c05c 100644
--- a/internal_version.h
+++ b/internal_version.h
@@ -2,4 +2,4 @@
 #define SCUMMVM_TOOLS_SVN_REVISION
 #endif
 
-#define SCUMMVM_TOOLS_VERSION "2.6.0git" SCUMMVM_TOOLS_SVN_REVISION
+#define SCUMMVM_TOOLS_VERSION "2.6.0" SCUMMVM_TOOLS_SVN_REVISION