l10n daemon script eab663565d 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"		2015-10-10 12:16:11 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-10 12:16:11 +00:00
kwindecoration
kwindesktop
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-10 12:16:11 +00:00
kwinrules
kwinscreenedges
kwinscripts
kwintabbox
CMakeLists.txt