l10n daemon script 8725f2441e 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-03-22 05:17:38 +01:00
..
CMakeLists.txt
magiclamp.cpp	[effects] Drop loading shadow config from MagicLamp	2016-11-15 07:19:26 +01:00
magiclamp.h	[effects] Drop loading shadow config from MagicLamp	2016-11-15 07:19:26 +01:00
magiclamp.kcfg
magiclamp_config.cpp
magiclamp_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-22 05:17:38 +01:00
magiclamp_config.h
magiclamp_config.ui
magiclampconfig.kcfgc