l10n daemon script 07259cfa59 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"		2017-06-28 09:36:23 +02:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-23 05:46:51 +02:00
kwindecoration
kwindesktop
kwinoptions
kwinrules
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-28 09:36:23 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-23 05:46:51 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-23 05:46:51 +02:00
CMakeLists.txt