l10n daemon script 9ca63ab501 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-10-24 05:56:19 +02:00
..
CMakeLists.txt	Make kpmcore link libraries private.	2018-03-31 16:30:53 +01:00
pmsfdiskbackendplugin.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-24 05:56:19 +02:00
sfdiskbackend.cpp	Set FlagBoot = FlagEsp and deprecate it.	2018-09-01 21:27:05 +01:00
sfdiskbackend.h	SoftwareRAID initial implementation.	2018-07-09 20:01:34 -03:00
sfdiskdevice.cpp	Remove ExternalCommand::waitFor.	2018-07-21 21:19:34 +01:00
sfdiskdevice.h	Use smart pointers for CoreBackendPartitionTable.	2018-03-31 21:49:20 +01:00
sfdiskpartitiontable.cpp	Set FlagBoot = FlagEsp and deprecate it.	2018-09-01 21:27:05 +01:00
sfdiskpartitiontable.h	sfdisk: store a pointer to the device in SfdiskPartitionTable class.	2017-12-07 20:50:54 +00:00