kwin/effects/magiclamp
l10n daemon script cfd296326b 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"
2019-10-23 05:33:32 +02:00
..
CMakeLists.txt Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
magiclamp.cpp Use nullptr everywhere 2019-09-19 17:48:21 +03:00
magiclamp.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +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 2019-10-23 05:33:32 +02:00
magiclamp_config.h Use nullptr everywhere 2019-09-19 17:48:21 +03:00
magiclamp_config.ui
magiclampconfig.kcfgc