You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script fd702c3644 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"
5 years ago
..
CMakeLists.txt
magiclamp.cpp
magiclamp.h Run clang-tidy with modernize-use-override check 5 years ago
magiclamp.kcfg
magiclamp_config.cpp
magiclamp_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 5 years ago
magiclamp_config.h Run clang-tidy with modernize-use-override check 5 years ago
magiclamp_config.ui
magiclampconfig.kcfgc