l10n daemon script dc447860be 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-04-25 10:05:35 +02:00
..
CMakeLists.txt
kwin-packagestructure-windowswitcher.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-25 10:05:35 +02:00
windowswitcher.cpp
windowswitcher.h