l10n daemon script 46691b17ac 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"		2016-08-16 10:09:08 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-16 10:09:08 +00:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-09 10:09:21 +00:00
kwindesktop
kwinoptions
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-06-23 21:12:32 +00:00
kwinscreenedges	Support triggering application launcher through screenedge	2016-08-10 20:39:28 +02:00
kwinscripts
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-06 12:43:39 +00:00
CMakeLists.txt