l10n daemon script 11954f1185 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"		2018-06-16 05:31:52 +02:00
..
CMakeLists.txt	Finish porting to KCoreAddons JSON plugins.	2018-03-02 11:33:46 +00:00
dummybackend.cpp	Move file system label and UUID read code to backends.	2018-01-31 15:13:34 +00:00
dummybackend.h	Move file system label and UUID read code to backends.	2018-01-31 15:13:34 +00:00
dummydevice.cpp	sfdisk: store a pointer to the device in SfdiskPartitionTable class.	2017-12-07 20:50:54 +00:00
dummydevice.h	sfdisk: store a pointer to the device in SfdiskPartitionTable class.	2017-12-07 20:50:54 +00:00
dummypartitiontable.cpp	Move setFlags function from CoreBackendPartition to CoreBackendPartitionTable.	2017-11-07 22:55:28 +00: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	2018-06-16 05:31:52 +02:00