From 171560a0329443d5a0f1c6a910eb3cb6a1913279 Mon Sep 17 00:00:00 2001
From: marco-calautti <marco.calautti@gmail.com>
Date: Sat, 30 Dec 2023 16:55:23 +0100
Subject: [PATCH] Preparation for v3.1.2

---
 CHANGELOG.txt               | 4 ++++
 app/include/common/common.h | 4 ++--
 app/mac_stuff/Info.plist    | 4 ++--
 app/win_stuff/resource.rc   | 8 ++++----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1e6c721..db75cd6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -13,6 +13,10 @@ Delta Patcher is a GUI software that is able to create and apply xdelta patches.
 2. Changelog
 -------------------------
 
+v3.1.2:
+- Log is now hidden by default: patch descriptions are shown in a tooltip when a patch is loaded.
+- For common patching errors (most notably checksum mismatch), a more user friendly messages is shown to the user.
+
 v3.1.1:
 - Fixed message dialogs not showing in patch creation mode.
 
diff --git a/app/include/common/common.h b/app/include/common/common.h
index 1131db3..cc13d97 100644
--- a/app/include/common/common.h
+++ b/app/include/common/common.h
@@ -22,9 +22,9 @@
 #include <common/COPYING.h>
 
 #ifdef 	__DP_DECODE_ONLY__
-	#define __DP_VERSION__ wxT("3.1.1 Lite")
+	#define __DP_VERSION__ wxT("3.1.2 Lite")
 #else 	
-	#define __DP_VERSION__ wxT("3.1.1")
+	#define __DP_VERSION__ wxT("3.1.2")
 #endif
 
 #define __DP_DISCLAIMER__ _("This program is free software: you can redistribute it\nand/or modify it under the terms of the GNU General\nPublic License as published by the Free Software Foundation,\nversion 2.0.")
diff --git a/app/mac_stuff/Info.plist b/app/mac_stuff/Info.plist
index 569826e..0faf3f0 100644
--- a/app/mac_stuff/Info.plist
+++ b/app/mac_stuff/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.1</string>
+	<string>3.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.1.1</string>
+	<string>3.1.2</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/app/win_stuff/resource.rc b/app/win_stuff/resource.rc
index aa504cb..b391bb8 100644
--- a/app/win_stuff/resource.rc
+++ b/app/win_stuff/resource.rc
@@ -3,8 +3,8 @@ mondrian ICON "icon.ico" //exe icon (Windows only)
 #include <wx/msw/wx.rc> //Enables Windows Styles
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,1,0
- PRODUCTVERSION 3,1,1,0
+ FILEVERSION 3,1,2,0
+ PRODUCTVERSION 3,1,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -20,12 +20,12 @@ BEGIN
         BLOCK "000004b0"
         BEGIN
             VALUE "FileDescription", "XDelta patching Utility"
-            VALUE "FileVersion", "3, 1, 1, 0"
+            VALUE "FileVersion", "3, 1, 2, 0"
             VALUE "InternalName", "DeltaPatcher"
             VALUE "LegalCopyright", "Copyright (C) 2010+ Phoenix"
             VALUE "OriginalFilename", "DeltaPatcher.exe"
             VALUE "ProductName", "Delta Patcher"
-            VALUE "ProductVersion", "3, 1, 1, 0"
+            VALUE "ProductVersion", "3, 1, 2, 0"
         END
     END
     BLOCK "VarFileInfo"