kwin/effects/mousemark
l10n daemon script a1c0d43deb 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"
2020-07-23 06:10:20 +02:00
..
CMakeLists.txt Reduce the amount of objects that are compiled several times 2020-04-02 00:41:55 +02:00
mousemark.cpp Add some const & 2019-10-30 19:23:01 +01:00
mousemark.h Add some const & 2019-10-30 19:23:01 +01:00
mousemark.kcfg
mousemark_config.cpp
mousemark_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-07-23 06:10:20 +02:00
mousemark_config.h
mousemark_config.ui
mousemarkconfig.kcfgc