l10n daemon script fd702c3644 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-09-17 05:29:51 +02:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
magiclamp.cpp	[effects] Port to new connect syntax	2019-01-26 01:22:06 +02:00
magiclamp.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
magiclamp.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
magiclamp_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
magiclamp_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-17 05:29:51 +02:00
magiclamp_config.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
magiclamp_config.ui	Use KConfigXT in MagicLamp effect	2012-09-19 09:29:27 +02:00
magiclampconfig.kcfgc	Use KConfigXT in MagicLamp effect	2012-09-19 09:29:27 +02:00