kwin/effects/mousemark
l10n daemon script 3eaf1a9972 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-22 07:44:41 +02:00
..
CMakeLists.txt
mousemark.cpp [effects] Use arg="true" in the kcfg files 2017-04-15 10:03:34 +02:00
mousemark.h
mousemark.kcfg [effects] Use arg="true" in the kcfg files 2017-04-15 10:03:34 +02:00
mousemark_config.cpp [effects] Use arg="true" in the kcfg files 2017-04-15 10:03:34 +02:00
mousemark_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-07-22 07:44:41 +02:00
mousemark_config.h
mousemark_config.ui
mousemarkconfig.kcfgc