l10n daemon script 81a4156faf 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-01-16 07:52:59 +01:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-16 07:52:59 +01:00
kwindecoration
kwindesktop
kwinoptions
kwinrules
kwinscreenedges
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-16 07:52:59 +01:00
kwintabbox
CMakeLists.txt