l10n daemon script 429d15941e 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-02-20 06:00:53 +01:00
..
CMakeLists.txt
kwin-packagestructure-scripts.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-20 06:00:53 +01:00
scripts.cpp
scripts.h