l10n daemon script a2a9bb8301 SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2020-04-04 06:23:31 +02:00
..
CMakeLists.txt	Make kpmcore link libraries private.	2018-03-31 16:30:53 +01:00
dummybackend.cpp	Add scanDevices function that uses flags instead of bools.	2019-02-09 15:40:06 +00:00
dummybackend.h	Add scanDevices function that uses flags instead of bools.	2019-02-09 15:40:06 +00:00
dummydevice.cpp	Remove extra semicolon after Q_UNUSED.	2018-07-12 00:12:43 +01:00
dummydevice.h	Fix minor EBN issues	2020-03-21 11:22:15 +00:00
dummypartitiontable.cpp	Add new job to set the GPT partition label	2020-03-25 11:20:01 -04:00
dummypartitiontable.h	Add new job to set the GPT partition label	2020-03-25 11:20:01 -04:00
pmdummybackendplugin.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-04-04 06:23:31 +02:00