diff --git a/kdiff3-1.11.2.tar.xz b/kdiff3-1.11.2.tar.xz deleted file mode 100644 index d5edba9..0000000 --- a/kdiff3-1.11.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91853775c3faa9522468ec123cd6de74662acb6d5116475996aca4dc2c3befc8 -size 1141676 diff --git a/kdiff3-1.11.2.tar.xz.sig b/kdiff3-1.11.2.tar.xz.sig deleted file mode 100644 index fe0ff61..0000000 --- a/kdiff3-1.11.2.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmZ/E8QACgkQ9EKzbWFL -BrwypQ//U2cjRvx1ygtZmRxGYAYz66V9BY+eXkPmonGMCpquIMof6adUXNSimOdv -DTO+NW3pXc42SDQalXx5u4xweboCRtaIaN/5huqbjXlBFKUDXkgOJoqrTlIYZ0j9 -rj80DphcFuFTlHaaLI/ZC+CKk/SabyATEsf3w/n/sCvzSlTcY2TpLYVrtv6WbTfz -9y04cRxFcDwEg2dvZ0EAbQAj2fqJaDKR412seM9+O5U6xXD35Z0lNesAzUmh2s3G -VZ59BKxjL6CNTtv+zWpVrohO3GFm5M2YUMYf0Xq/biVUqBwS2l243dlfJxHf5RDB -hi0SoURJePjfc9e5BuSWVRVgf5l82XaGIvUmKn82sJ4Xq1eSvUwl7dhsWvGg5tCn -1CRV7dkjBn/DdDY6vnDvv4PkxKaZuS6B7DzeLilkZfzd3xpDK/GjT+6gsQfZMl1h -3Q9jUyM3kJM/1/7vTeFOncHhyVq5esoq5DXPJz7/HFewssY9Aje5t9trCVZXySPN -IziuneKvPr1VTNAOHe9KbBck1NMYvY5oC0cYCjX+RaBThPVsr+rWqCTrH3iDGfl7 -pw3wrbAKd3p3uT0tUzfL96iIyXxJ0FL38js8GM/n6/Ge0ypmUfnRGIwyWABNrfpk -AIF4RGUuu3nZ2+cRQ5Pj3D+SjdfNoqQudMSBwBRTyM28ZbYxxvk= -=6RVB ------END PGP SIGNATURE----- diff --git a/kdiff3-1.11.4.tar.xz b/kdiff3-1.11.4.tar.xz new file mode 100644 index 0000000..39725ab --- /dev/null +++ b/kdiff3-1.11.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aede7bdc9aa9675aee90fd2a3527052ed31b30918d42e6907a592cba7ce6a7c3 +size 1142276 diff --git a/kdiff3-1.11.4.tar.xz.sig b/kdiff3-1.11.4.tar.xz.sig new file mode 100644 index 0000000..14f8571 --- /dev/null +++ b/kdiff3-1.11.4.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmbgwToACgkQ9EKzbWFL +BrzuYw//bUBbRiwfdzQvmXuVC7y34DThoPXLWiTYRo5KzDctw1/efYEP36JQDqJ5 +DWwuvRDY5QzBpBfe7LOqQCk1TCxtI4csHc25rk0VnDZtxjiKdLgNssvwwKAdLqty +CtuuhkjwVtwd/Ihju6w/Q/bvF4InBoxkj51bYYYVBkNhYmooAYOXzDvlXZLn92rZ +5wa8bTAK9eV1R51zS2HvWCxN1EqKNcTzNGdc+0+vNsS2Llfu9tk5hRrt3kMqDDkY +lluEbMb/rskAOgFICZE6Pw3oI5xa7njecsaQy0HlaJFeOk6yKQJOOLxxQa3DoT6Z +bGkiY/8A0YaICfJg8khhIiPRQkHEpqkfJSMgDG3kmUHoFhlTnGMbDvfjqAoYFwbU +YQK/N4zeW5HzZ03VSFNPgbLrjErC/TaeSuagFVFXejrtZdzTaumxOtilsJ1DhJss +6lnCQaLMuqxlhDe2P/ZYiYaDdOLUXFd7AQrNdV1vpOKRXbN88trh3LKQo3tEDTPD +3MP+ptpXVe2YOmBlTtIxe1Bnisda2wnhCkKJ0wlG32MUcKiK2tzuXrTWJzJfCSKi +ah/rC28hFU7QQokHgu/WqbfXwaR9lz9SMvJHYzdc5imbA52mhiI6ruAfbpr09CnF +g0HIyAjkyYfBnei8aCka7ByZlzk/VFoYJ14cvBfNUWnbYJgI/n0= +=daOY +-----END PGP SIGNATURE----- diff --git a/kdiff3.changes b/kdiff3.changes index 38684d4..60be8e9 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Oct 1 21:09:52 UTC 2024 - Christophe Marin + +- Update to 1.11.4 + * Adapt Diff3Line::getLineData to handle being called on + non-existant lines + * Suppress clang warning for quirky QT "enum" use + * Pass over diff code completely if no data is loaded + * Do full clearing of all diff related lists when one is cleared + ------------------------------------------------------------------- Mon Jul 1 09:25:11 UTC 2024 - Christophe Marin diff --git a/kdiff3.spec b/kdiff3.spec index f4d97fe..10ef0c0 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -21,7 +21,7 @@ %bcond_without released Name: kdiff3 -Version: 1.11.2 +Version: 1.11.4 Release: 0 Summary: Code Comparison Utility License: GPL-2.0-or-later