l10n daemon script 6eab8757b5 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-06 05:23:24 +02:00
..
CMakeLists.txt	Finish porting to KCoreAddons JSON plugins.	2018-03-02 11:33:46 +00:00
libpartedbackend.cpp	Move file system label and UUID read code to backends.	2018-01-31 15:13:34 +00:00
libpartedbackend.h	Move file system label and UUID read code to backends.	2018-01-31 15:13:34 +00:00
libparteddevice.cpp	Fix conversion to/from QString/QByteArray	2017-12-03 12:37:21 +00:00
libparteddevice.h	Replace readSectors/writeSectors backend functions.	2017-10-28 18:07:44 +01:00
libpartedpartitiontable.cpp	Merge branch 'master' into sfdisk	2017-12-03 12:38:43 +00:00
libpartedpartitiontable.h	Allow setting boot, esp and bios-grub flags in sfdisk backend.	2017-11-08 00:01:24 +00:00
pedflags.h	Rename KPMcore include guards.	2017-09-10 20:12:52 +01:00
pmlibpartedbackendplugin.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-06 05:23:24 +02:00