Git commit 1c4b82d720b8e4c8aaf7abaecda3b4cd3d656ee4 by Michael Reeves. Committed on 22/02/2019 at 18:21. Pushed by mreeves into branch 'master'.
Update version/author info. M +1 -1 README M +11 -4 doc/en/index.docbook M +2 -2 doc/en/man-kdiff3.1.docbook M +1 -1 windows_installer/kdiff3.nsi https://commits.kde.org/kdiff3/1c4b82d720b8e4c8aaf7abaecda3b4cd3d656ee4 diff --git a/README b/README index ab79d32..edd3ba4 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.7.90 +KDiff3-Version: 1.8 Now requires Qt 5.6 or later and KF5 5.14+. Legacy 0.9.98 and earlier builds are not supported. MacOSX build is untested since port. The Konqueror specific plugin is not ported and no longer maintained. diff --git a/doc/en/index.docbook b/doc/en/index.docbook index d727f1d..a896394 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -16,6 +16,13 @@ as Authors, publish date, the abstract, and Keywords --> <authorgroup> <author> <!--<personname>--> +<firstname>Michael</firstname> +<surname>Reeves</surname> +<!--</personname>--> +<affiliation><address> + <email>[email protected]</email> +</address></affiliation> +<!--<personname>--> <firstname>Joachim</firstname> <surname>Eibl</surname> <!--</personname>--> @@ -31,7 +38,7 @@ as Authors, publish date, the abstract, and Keywords --> <holder>Joachim Eibl</holder> </copyright> <copyright> -<year>2017</year> +<year>2017-2019</year> <holder>Michael Reeves</holder> </copyright> <!-- Translators: put here the copyright notice of the translation --> @@ -46,8 +53,8 @@ Please respect the format of the date (YYYY-MM-DD) and of the version (V.MM.LL), it could be used by automation scripts. Do NOT change these in the translation. --> -<date>2018-04-30</date> -<releaseinfo>1.07.00</releaseinfo> +<date>2019-02-22</date> +<releaseinfo>1.08.00</releaseinfo> <abstract> @@ -65,7 +72,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.7.90. + This document describes &kdiff3;-version 1.8. </para> </abstract> diff --git a/doc/en/man-kdiff3.1.docbook b/doc/en/man-kdiff3.1.docbook index 2243f92..f77de83 100644 --- a/doc/en/man-kdiff3.1.docbook +++ b/doc/en/man-kdiff3.1.docbook @@ -10,8 +10,8 @@ <contrib>KDiff3 man page.</contrib> &Burkhard.Lueck.mail; </author> -<date>2018-05-19</date> -<releaseinfo>kdiff3 1.7.90</releaseinfo> +<date>2019-02-22</date> +<releaseinfo>kdiff3 1.8</releaseinfo> </refentryinfo> <refmeta> diff --git a/windows_installer/kdiff3.nsi b/windows_installer/kdiff3.nsi index bf7b74b..f925b13 100644 --- a/windows_installer/kdiff3.nsi +++ b/windows_installer/kdiff3.nsi @@ -3,7 +3,7 @@ ;Apdapted for KDiff3 by Sebastien Fricker and Joachim Eibl ;Requires nsis_v2.19 -!define KDIFF3_VERSION "1.07.95" +!define KDIFF3_VERSION "1.08.00" !define DIFF_EXT32_CLSID "{9F8528E4-AB20-456E-84E5-3CE69D8720F3}" !define DIFF_EXT64_CLSID "{34471FFB-4002-438b-8952-E4588D0C0FE9}"
