l10n daemon script 0db88c3ea6 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-12-15 01:55:28 +00:00
..
CMakeLists.txt	effects: Link builtin effects with executables	2021-10-19 09:12:15 +00:00
main.cpp	Utilize KCoreAddons infrastructure for static plugins	2021-11-24 10:48:51 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:55:28 +00:00
snaphelper.cpp	effects: Port effects from int screens ids to EffectScreen	2021-10-20 12:09:09 +00:00
snaphelper.h