l10n daemon script 5d99392d1e 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"		2021-12-19 01:42:01 +00:00
..
common	[kcms/effectsmodel] Port away from KPluginInfo	2021-12-03 07:31:06 +00:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:55:28 +00:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:55:28 +00:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:55:28 +00:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:55:28 +00:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:55:28 +00:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:55:28 +00:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-19 01:42:01 +00:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:55:28 +00:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:55:28 +00:00
kwinvirtualkeyboard	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:55:28 +00:00
CMakeLists.txt	Provide a kcm module to choose a virtual keyboard	2021-04-26 12:40:20 +00:00