l10n daemon script b7306d2d19 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-02-07 05:43:45 +01: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	Use smart pointers for CoreBackendPartitionTable.	2018-03-31 21:49:20 +01:00
dummypartitiontable.cpp	Explicitely specify the scope of enum.	2018-04-07 19:54:30 +01:00
dummypartitiontable.h	Move setFlags function from CoreBackendPartition to CoreBackendPartitionTable.	2017-11-07 22:55:28 +00:00
pmdummybackendplugin.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-07 05:43:45 +01:00