l10n daemon script c10fe06d06 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-06-18 05:44:57 +02:00
..
CMakeLists.txt
showpaint.cpp
showpaint.h
showpaint_config.cpp	[effects] Port from deprecated method KCModule::changed	2020-01-24 01:18:48 +00:00
showpaint_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
showpaint_config.h	Update my email address	2020-01-14 18:17:18 +02:00
showpaint_config.ui