Git commit 04f6b4253e9235f4f85193b78a0bcd40a4ddb036 by Michael Reeves. Committed on 17/05/2023 at 18:59. Pushed by mreeves into branch '1.10'.
Bump version 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 M +1 -0 src/org.kde.kdiff3.appdata.xml https://invent.kde.org/sdk/kdiff3/commit/04f6b4253e9235f4f85193b78a0bcd40a4ddb036 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e9e1b42..23e8d11a 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.3) +project(kdiff3 VERSION 1.10.4) option(BUILD_WITH_QT6 OFF) option(CMAKE_CXX_OUTPUT_EXTENSION_REPLACE ON) diff --git a/ChangeLog b/ChangeLog index e76a1eda..71162c49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 1.10.4 - 2023 +===================== +*Fixed no UI shown for failed auto-merge. + Version 1.10.3 - 2023 =========================== *Fix 469817 no text if word wrap is on. diff --git a/README b/README index f76268d4..925048de 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 ([email protected]) -KDiff3-Version: 1.10.3 +KDiff3-Version: 1.10.4 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 d8226cbc..15f5e1ab 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.2. + This document describes &kdiff3;-version 1.10.4. </para> </abstract> diff --git a/src/kdiff3part.desktop b/src/kdiff3part.desktop index a0559fc2..e766b631 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;[email protected] -X-KDE-PluginInfo-Version=1.10.3 +X-KDE-PluginInfo-Version=1.10.4 diff --git a/src/org.kde.kdiff3.appdata.xml b/src/org.kde.kdiff3.appdata.xml index f65b2c2b..8224ce25 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.4" date="2023-05-18"/> <release version="1.10.3" date="2023-05-17"/> <release version="1.10.2" date="2023-05-3"/> <release version="1.10.1" date="2023-03-27"/>
