[sdk/kdiff3/1.10] /: Bump version to 1.10.5

[Michael Reeves]

Git commit 75bd291f7946c27fc7d5f781b2037e4600111035 by Michael Reeves.
Committed on 06/06/2023 at 18:39.
Pushed by mreeves into branch '1.10'.

Bump version to 1.10.5

M  +1    -1    CMakeLists.txt
M  +4    -0    ChangeLog
M  +1    -1    README
M  +1    -1    doc/en/index.docbook
M  +1    -1    src/kdiff3part.desktop

https://invent.kde.org/sdk/kdiff3/-/commit/75bd291f7946c27fc7d5f781b2037e4600111035

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23e8d11a..2e32abcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
 #CMP0077 is defined in 3.13 or later
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(kdiff3 VERSION 1.10.4)
+project(kdiff3 VERSION 1.10.5)
 
 option(BUILD_WITH_QT6 OFF)
 option(CMAKE_CXX_OUTPUT_EXTENSION_REPLACE ON)
diff --git a/ChangeLog b/ChangeLog
index 71162c49..f6d7ce62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Version 1.10.5 - 2023
+=====================
+*Resolve thread safety issues in word wrap runner
+
 Version 1.10.4 - 2023
 =====================
 *Fixed no UI shown for failed auto-merge.
diff --git a/README b/README
index 925048de..7bb0f7d3 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ KDiff3-Readme
 
 Author: Joachim Eibl  (joachim.eibl at gmx.de)
 Port to KF5/Qt5 by Michael Reeves (reeves.87 at gmail.com)
-KDiff3-Version: 1.10.4
+KDiff3-Version: 1.10.5
 
 Now requires Qt 5.15 or later and KF5 5.50+. Legacy 0.9.98 and earlier builds are not supported.
 MacOS X build is 64-bit only unfortunately I can't test build locally. The Konqueror specific plug-in
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 15f5e1ab..3d5a1c8e 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -70,7 +70,7 @@ Do NOT change these in the translation. -->
 <listitem><para>supports version control keyword and history merging.</para></listitem>
 </itemizedlist>
 </para><para>
-   This document describes &kdiff3;-version 1.10.4.
+   This document describes &kdiff3;-version 1.10.5.
 </para>
 </abstract>
 
diff --git a/src/kdiff3part.desktop b/src/kdiff3part.desktop
index e766b631..7158b5ca 100644
--- a/src/kdiff3part.desktop
+++ b/src/kdiff3part.desktop
@@ -55,5 +55,5 @@ X-KDE-PluginInfo-License=GPLv2
 X-KDE-PluginInfo-Description= A KPart for displaying diffs
 X-KDE-PluginInfo-Authors=Joachim Eibl;Michael Reeves
 X-KDE-PluginInfo-Emails=joachim.eibl at gmx.de;reeves.87 at gmail.com
-X-KDE-PluginInfo-Version=1.10.4
+X-KDE-PluginInfo-Version=1.10.5