kwin/effects/mousemark
l10n daemon script 866dfb4e89 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"
2021-01-14 07:04:00 +01:00
..
CMakeLists.txt Reduce the amount of objects that are compiled several times 2020-04-02 00:41:55 +02:00
mousemark.cpp If include is define in .h remove it if it's defined in .cpp too (scripted) 2020-10-23 21:37:16 +02:00
mousemark.h Prettify license headers 2020-08-07 19:57:56 +00:00
mousemark.kcfg
mousemark_config.cpp Remove defunct calls to KAboutData::pluginInfo 2020-10-22 09:43:52 +00:00
mousemark_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2021-01-14 07:04:00 +01:00
mousemark_config.h Prettify license headers 2020-08-07 19:57:56 +00:00
mousemark_config.ui
mousemarkconfig.kcfgc