l10n daemon script 71c3f063bb 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"		2019-10-23 09:01:14 +02:00
..
CMakeLists.txt	Correctly set i18n suffix in mousemark spinbox.	2016-11-02 13:07:39 +00:00
mousemark.cpp	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
mousemark.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
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	2019-10-23 09:01:14 +02:00
mousemark_config.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
mousemark_config.ui	Correctly set i18n suffix in mousemark spinbox.	2016-11-02 13:07:39 +00:00
mousemarkconfig.kcfgc