l10n daemon script 78c0095a5d 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-02-11 05:59:16 +01:00
..
CMakeLists.txt	[effects] Remove unneeded link to KService	2019-11-26 17:30:04 +01:00
magiclamp.cpp	Use nullptr everywhere	2019-09-19 17:48:21 +03: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	2020-02-11 05:59:16 +01:00
magiclamp_config.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
magiclamp_config.ui
magiclampconfig.kcfgc