l10n daemon script dcb04308ee 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"		2022-01-13 01:44:19 +00:00
..
CMakeLists.txt	Do not embed json metadata in KCMs that get loaded by path	2022-01-05 08:12:13 +01:00
diminactive.cpp
diminactive.h
diminactive.kcfg
diminactive_config.cpp	Do not embed json metadata in KCMs that get loaded by path	2022-01-05 08:12:13 +01:00
diminactive_config.h
diminactive_config.ui
diminactiveconfig.kcfgc
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	2022-01-13 01:44:19 +00:00