l10n daemon script 5cb6f51ef6 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-10-11 06:01:48 +02:00
..
common	[kcms/effectmodel] Use KPluginMetaData to load scripted config	2020-10-01 14:28:46 +00:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-11 06:01:48 +02:00
kwindecoration	KCM KWin Decoration: Add module data	2020-10-07 12:29:02 +02:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kwinoptions	KCM KWin Manage default Highlight indicator for settings not handled by KCModule	2020-09-30 09:10:23 +02:00
kwinrules	[kcm/kwinrules] Add properties to a rule one-by-one	2020-10-07 23:08:23 +02:00
kwinscreenedges	KCM KWin Manage default Highlight indicator for settings not handled by KCModule	2020-09-30 09:10:23 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-09 06:39:13 +02:00
kwintabbox	KCM KWin Manage default Highlight indicator for settings not handled by KCModule	2020-09-30 09:10:23 +02:00
CMakeLists.txt