l10n daemon script b3a8a3874f 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-04-23 05:26:25 +02:00
..
CMakeLists.txt	Finish porting to KCoreAddons JSON plugins.	2018-03-02 11:33:46 +00:00
pmsfdiskbackendplugin.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-23 05:26:25 +02:00
sfdiskbackend.cpp	Fix regular expression used in readLabel and readUUID.	2018-02-04 15:56:30 +00:00
sfdiskbackend.h	Move file system label and UUID read code to backends.	2018-01-31 15:13:34 +00:00
sfdiskdevice.cpp	Commit partition table when closing Sfdisk backend device.	2017-12-25 00:11:13 +00:00
sfdiskdevice.h	sfdisk: store a pointer to the device in SfdiskPartitionTable class.	2017-12-07 20:50:54 +00:00
sfdiskpartitiontable.cpp	Fix a possibly uninitialized variable.	2018-01-31 14:58:43 +00:00
sfdiskpartitiontable.h	sfdisk: store a pointer to the device in SfdiskPartitionTable class.	2017-12-07 20:50:54 +00:00