| author | Matthieu Gallien <matthieu.gallien@nextcloud.com> | |
| Tue, 2 May 2023 11:55:17 +0000 (13:55 +0200) | ||
| committer | Matthieu Gallien <matthieu_gallien@yahoo.fr> | |
| Wed, 17 May 2023 06:43:54 +0000 (08:43 +0200) | ||
| commit | 280094b220af55faf5f71010dcbce45155b70c3c | |
| tree | e0eb1b481e296aa88fa4a2f08a9c6decb0f1e4f1 | tree | snapshot |
| parent | 8f61d539da2dc9c0da44f5eb4408cb82e3227ea4 | commit | diff |
| src/gui/CMakeLists.txt | diff | blob | history | |
| src/gui/ResolveConflictsDialog.qml | diff | blob | history | |
| src/gui/folderman.h | diff | blob | history | |
| src/gui/owncloudgui.cpp | diff | blob | history | |
| src/gui/syncconflictsmodel.cpp | [new file with mode: 0644] | blob |
| src/gui/syncconflictsmodel.h | [new file with mode: 0644] | blob |
| test/CMakeLists.txt | diff | blob | history | |
| test/testsyncconflictsmodel.cpp | [new file with mode: 0644] | blob |