kwin/effects/mousemark
l10n daemon script 3b3aa82f58 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"
2018-07-23 05:24:40 +02:00
..
CMakeLists.txt
mousemark.cpp
mousemark.h
mousemark.kcfg
mousemark_config.cpp
mousemark_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-23 05:24:40 +02:00
mousemark_config.h
mousemark_config.ui
mousemarkconfig.kcfgc