[sdk/kdiff3/1.10] /: Bump version

[Michael Reeves]

Git commit b2d9bfbd91281d186d03dccb335a3e127e206fb6 by Michael Reeves.
Committed on 27/03/2023 at 17:03.
Pushed by mreeves into branch '1.10'.

Bump version

M  +1    -1    CMakeLists.txt
M  +11   -2    ChangeLog
M  +1    -1    README
M  +1    -1    doc/en/index.docbook
M  +1    -1    src/kdiff3part.desktop
M  +1    -0    src/org.kde.kdiff3.appdata.xml

https://invent.kde.org/sdk/kdiff3/commit/b2d9bfbd91281d186d03dccb335a3e127e206fb6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b1e83a9..31dc8e6d 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.0)
+project(kdiff3 VERSION 1.10.1)
 
 option(BUILD_WITH_QT6 OFF)
 option(CMAKE_CXX_OUTPUT_EXTENSION_REPLACE ON)
diff --git a/ChangeLog b/ChangeLog
index 65922e5e..e9ae5189 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,18 @@
-Version 1.10 - 2023-
+Version 1.10.1 - 2023
+===========================
+*467652 - "Escape" shortcut ignored if merge output in focus
+*466522 - save and restore dock states
+*439148 - Show UI before comparison start
+*466241 - Don't crash on broken links
+*466524 - Fix memory safety issues during reload.
+*Fix mishandling line count for files containing '0x0b'
+
+Version 1.10 - 2023
 ===========================
 *Make DirectoryMergeWindow and DirecoryMergeInfo QDockWidgets.
 *Use Qt native saveState/restoreState
 
-Version 1.9 - 2021-23
+Version 1.9 - 2021
 ===========================
 *Rewrite of SourceData::FileData::preprocess now only loops through file contents once.
 *Major rework of event handling
diff --git a/README b/README
index c4cb081a..8b0b428a 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.0
+KDiff3-Version: 1.10.1
 
 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 6fdfc1a1..a9754c1b 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.
+   This document describes &kdiff3;-version 1.10.1.
 </para>
 </abstract>
 
diff --git a/src/kdiff3part.desktop b/src/kdiff3part.desktop
index ed810feb..e66eb8c5 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.0
+X-KDE-PluginInfo-Version=1.10.1
 
diff --git a/src/org.kde.kdiff3.appdata.xml b/src/org.kde.kdiff3.appdata.xml
index 36661487..dbd31c6f 100644
--- a/src/org.kde.kdiff3.appdata.xml
+++ b/src/org.kde.kdiff3.appdata.xml
@@ -370,6 +370,7 @@
     <binary>kdiff3</binary>
   </provides>
   <releases>
+    <release version="1.10.1" date="2023-03-27"/>
     <release version="1.10.0" date="2023-01-5"/>
     <release version="1.9.6" date="2022-06-23"/>
     <release version="1.9.5" date="2022-03-02"/>