kpmcore/src/plugins
l10n daemon script 4406297053 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-03-12 04:59:29 +01:00
..
dummy SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-12 04:59:29 +01:00
libparted SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-12 04:59:29 +01:00
sfdisk SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-06 05:21:11 +01:00
CMakeLists.txt Finish porting to KCoreAddons JSON plugins. 2018-03-02 11:33:46 +00:00