l10n daemon script 3b3aa82f58 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"		2018-07-23 05:24:40 +02:00
..
CMakeLists.txt
magiclamp.cpp	[effects/magiclamp] Eliminate unnecessary reallocations	2018-07-15 01:41:37 +03:00
magiclamp.h	[effects/magiclamp] Port to TimeLine	2018-06-30 10:40:33 +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	2018-07-23 05:24:40 +02:00
magiclamp_config.h
magiclamp_config.ui
magiclampconfig.kcfgc