kpmcore/src
l10n daemon script a4379583b3 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-03-27 06:21:07 +01:00
..
backend Fix minor EBN issues 2020-03-21 11:22:15 +00:00
core Merge branch 'gportay/kpmcore-partition-type' 2020-03-22 01:49:35 +00:00
fs Merge branch 'gportay/kpmcore-update-filesystem-features-api' 2020-03-22 01:24:57 +00:00
gui Fix minor EBN issues 2020-03-21 11:22:15 +00:00
jobs Fix minor EBN issues 2020-03-21 11:22:15 +00:00
ops Fix minor EBN issues 2020-03-21 11:22:15 +00:00
plugins SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-27 06:21:07 +01:00
util SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-27 06:21:07 +01:00
CMakeLists.txt Use KF5::AuthCore instead of KF5::Auth 2019-02-16 00:25:37 +01:00
Messages.sh Remove kcfg and kcfgc files. 2015-07-21 12:44:40 +02:00