l10n daemon script c10fe06d06 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-06-18 05:44:57 +02:00
..
CMakeLists.txt	Reduce the amount of objects that are compiled several times	2020-04-02 00:41:55 +02:00
magiclamp.cpp	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
magiclamp.h
magiclamp.kcfg
magiclamp_config.cpp
magiclamp_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
magiclamp_config.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
magiclamp_config.ui
magiclampconfig.kcfgc