l10n daemon script 1843a99895 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-06-17 14:16:14 +02:00
..
backend	Add new job to set the GPT partition attributes	2020-06-15 17:51:42 -04:00
core	Add new job to set the GPT partition attributes	2020-06-15 17:51:42 -04:00
fs	Merge branch 'gportay/kpmcore-update-filesystem-features-api'	2020-03-22 01:24:57 +00:00
gui	Fix some issues spotted by David Faure.	2020-05-08 15:10:56 +01:00
jobs	Add new job to set the GPT partition attributes	2020-06-15 17:51:42 -04:00
ops	Add new job to set the GPT partition attributes	2020-06-15 17:51:42 -04:00
plugins	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-17 14:16:14 +02:00
util	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-17 14:16:14 +02: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