l10n daemon script 0abc5e020f 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"		2017-12-25 04:44:28 +01:00
..
CMakeLists.txt	Correctly set i18n suffix in mousemark spinbox.	2016-11-02 13:07:39 +00:00
mousemark.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
mousemark.h	MouseMark effect supports QPainter compositor	2014-01-09 13:29:40 +01: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	2017-12-25 04:44:28 +01:00
mousemark_config.h	Use KConfigXT in MouseMark Effect	2012-09-14 10:39:28 +02:00
mousemark_config.ui	Correctly set i18n suffix in mousemark spinbox.	2016-11-02 13:07:39 +00:00
mousemarkconfig.kcfgc	Use KConfigXT in MouseMark Effect	2012-09-14 10:39:28 +02:00