l10n daemon script 80c17e43d1 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"		2019-04-18 06:12:39 +02:00
..
common	[kcmkwin] Actually save effect settings	2019-04-10 11:40:46 +03:00
kwincompositing
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-12 05:58:07 +02:00
kwindesktop
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-12 05:58:07 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-06 06:06:15 +02:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-18 06:12:39 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-08 05:54:38 +02:00
kwinscripts
kwintabbox
CMakeLists.txt