l10n daemon script bbcc51fabf 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-02 05:53:52 +01:00
..
common	Remove the "Candy" category and fold its contents into "Appearance"	2020-02-25 11:26:27 -07:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-02 05:53:52 +01:00
kwindecoration	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
kwindesktop	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
kwineffects	Merge branch 'Plasma/5.18'	2020-02-22 12:02:14 +01:00
kwinoptions	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
kwinrules	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
kwinscreenedges	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
kwintabbox	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
CMakeLists.txt