l10n daemon script 1843a99895 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-06-17 14:16:14 +02:00
..
CMakeLists.txt	sfdisk: Move GPT Attributes functions to new sfdiskgptattributes	2020-06-16 20:15:56 -04:00
pmsfdiskbackendplugin.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-17 14:16:14 +02:00
sfdiskbackend.cpp	sfdisk: Move GPT Attributes functions to new sfdiskgptattributes	2020-06-16 20:15:56 -04:00
sfdiskbackend.h	Add scanDevices function that uses flags instead of bools.	2019-02-09 15:40:06 +00:00
sfdiskdevice.cpp	Remove ExternalCommand::waitFor.	2018-07-21 21:19:34 +01:00
sfdiskdevice.h	Fix minor EBN issues	2020-03-21 11:22:15 +00:00
sfdiskgptattributes.cpp	sfdisk: Move GPT Attributes functions to new sfdiskgptattributes	2020-06-16 20:15:56 -04:00
sfdiskgptattributes.h	sfdisk: Move GPT Attributes functions to new sfdiskgptattributes	2020-06-16 20:15:56 -04:00
sfdiskpartitiontable.cpp	sfdisk: Move GPT Attributes functions to new sfdiskgptattributes	2020-06-16 20:15:56 -04:00
sfdiskpartitiontable.h	Add new job to set the GPT partition attributes	2020-06-15 17:51:42 -04:00