l10n daemon script bd3083e81f 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"		2016-01-30 09:40:55 +00:00
..
CMakeLists.txt
magiclamp.cpp
magiclamp.h
magiclamp.kcfg
magiclamp_config.cpp
magiclamp_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-30 09:40:55 +00:00
magiclamp_config.h
magiclamp_config.ui
magiclampconfig.kcfgc