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
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
mousemark.kcfg
mousemark_config.cpp
mousemark_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
mousemark_config.h
mousemark_config.ui
mousemarkconfig.kcfgc