diff --git a/kdiff3-1.11.4.tar.xz b/kdiff3-1.11.4.tar.xz deleted file mode 100644 index 39725ab..0000000 --- a/kdiff3-1.11.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 14f8571..0000000 --- a/kdiff3-1.11.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------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-1.11.5.tar.xz b/kdiff3-1.11.5.tar.xz new file mode 100644 index 0000000..fb57364 --- /dev/null +++ b/kdiff3-1.11.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:420f18b3b9689698a05e102f8a41719049074da68f96c94be18d1b8297eeb545 +size 1142840 diff --git a/kdiff3-1.11.5.tar.xz.sig b/kdiff3-1.11.5.tar.xz.sig new file mode 100644 index 0000000..638c8aa --- /dev/null +++ b/kdiff3-1.11.5.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmcs2v8ACgkQ9EKzbWFL +BrxLLg//bhaMWjI5UUtp4fBXvjTuuvSh8rraM/G3b/g8i48JYYEH0J9vURdQQFNZ +V4mshH937VhCvJNTdfythRebFwTOlgyTtZrK10A3qo77CHHbTWpdwPngbTINX5qx +9Oot8L9B4N5+6k4Usn513rkZl3BO3U79a5/HSjyubXjamLjgkCWPQcQKO52OUhkt +MoycoEYquPyWk2q0elciqK5bpysWYh9BowMsqvmaumuP7CY9biXAk6+rW8lD2F83 +ZSQnqWZ27yrvQSmTgCas9x96dCwEtX0p6gkxm6G9gGcRzQghIt9lzEs62mPjSSS3 +WqKshJyZTJhpMu0ffkDQhk54z9P9+OW+pz75mnyAvrSDz+u3ZNcpbJ8sLEag8sQS +VdvXTMLk2o3d0Pcf+X+IthebVTlHR7p+MrR3BsSnBmZJczNDZIi+aNWtWPPGzdDf +eK3VByPGGSdWyoLPeFArFCABRNAjDZFqdifnQwbBlMa59NzK1of/QCK6JIG0wnyH +tkWQx5zgleq2nMyZ1NNCxSJ7/hgqWkylLusW4x/FOnqGIvXrbtoJDlsvwo1irvpn +lTkYs8FEgOndGWpZcN/0BnXe7DzL3PMkiUf1jL8TWqXWFOoJFezriXdL1TlPS933 +Woq9ZNEO4yrknZ29oadczc/SeC9jjNx81xU5cq2rJ7zqd7mpFvo= +=Cp/I +-----END PGP SIGNATURE----- diff --git a/kdiff3.changes b/kdiff3.changes index 60be8e9..96c9a33 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Nov 8 12:43:47 UTC 2024 - Christophe Marin + +- Update to 1.11.5 + * Fix false memory error when using "admin://" protocol + * Cleanup BOM handling lock detection to only known UTF-* + encodings that use it. + * Fix bugged connection to non-existent signal (This is why + we now use new style connections only.) + * fix regression in diff margin color. + * fix crash on deleting first line in diff block + * fix merge encoding detection. + ------------------------------------------------------------------- Tue Oct 1 21:09:52 UTC 2024 - Christophe Marin diff --git a/kdiff3.spec b/kdiff3.spec index 10ef0c0..dc183f8 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -21,7 +21,7 @@ %bcond_without released Name: kdiff3 -Version: 1.11.4 +Version: 1.11.5 Release: 0 Summary: Code Comparison Utility License: GPL-2.0-or-later