l10n daemon script 954151ca97 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"		2021-10-31 01:14:25 +00:00
..
CMakeLists.txt	effects: Link builtin effects with executables	2021-10-19 09:12:15 +00:00
magiclamp.cpp	kwineffects: Remove WindowQuadType	2021-06-14 07:56:02 +00:00
magiclamp.h	effects/magiclamp: Port to DeformEffect	2021-05-31 05:27:22 +00:00
magiclamp.kcfg
magiclamp_config.cpp
magiclamp_config.desktop
magiclamp_config.h
magiclamp_config.ui
magiclampconfig.kcfgc
main.cpp	effects: Link builtin effects with executables	2021-10-19 09:12:15 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-10-31 01:14:25 +00:00