kpmcore/src/plugins
l10n daemon script 85085d8eb7 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-01-13 04:47:56 +01:00
..
dummy sfdisk: store a pointer to the device in SfdiskPartitionTable class. 2017-12-07 20:50:54 +00:00
libparted backend: provide more information about backend device. 2017-12-06 21:33:31 +00:00
sfdisk SVN_SILENT made messages (.desktop file) - always resolve ours 2018-01-13 04:47:56 +01:00
CMakeLists.txt Add an experimental sfdisk backend. 2017-11-07 22:51:29 +00:00
pmcorebackendplugin.desktop Add an experimental sfdisk backend. 2017-11-07 22:51:29 +00:00