https://bugs.kde.org/show_bug.cgi?id=381625
Maik Qualmann <metzping...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|REPORTED |RESOLVED
Resolution|--- |FIXED
Version Fixed In| |7.0.0
Latest Commit| |https://invent.kde.org/grap
| |hics/digikam/commit/312a577
| |51d604899f853851213b180e3a7
| |4b25d9
--- Comment #28 from Maik Qualmann <metzping...@gmail.com> ---
Git commit 312a57751d604899f853851213b180e3a74b25d9 by Maik Qualmann.
Committed on 27/06/2020 at 15:13.
Pushed by mqualmann into branch 'master'.
add simple file conflict dialog when file conflicts are detected
FIXED-IN: 7.0.0
M +2 -1 NEWS
M +67 -5 core/libs/database/utils/ifaces/dio.cpp
M +37 -3 core/libs/iojobs/iojob.cpp
M +12 -0 core/libs/iojobs/iojobdata.cpp
M +11 -0 core/libs/iojobs/iojobdata.h
M +40 -0 core/libs/threadimageio/engine/dfileoperations.cpp
M +10 -2 core/libs/threadimageio/engine/dfileoperations.h
https://invent.kde.org/graphics/digikam/commit/312a57751d604899f853851213b180e3a74b25d9
--
You are receiving this mail because:
You are watching all bug changes.
