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
desktopgrid.cpp	DesktopGridEffect: Fix crash when closing the effect	2022-01-07 21:16:04 +00:00
desktopgrid.h	Rename EffectQuickScene to OffscreenQuickScene	2021-11-23 09:53:18 +00:00
desktopgrid.kcfg
desktopgrid_config.cpp	Do not embed json metadata in KCMs that get loaded by path	2022-01-05 08:12:13 +01:00
desktopgrid_config.h
desktopgrid_config.ui
desktopgridconfig.kcfgc
main.cpp	Utilize KCoreAddons infrastructure for static plugins	2021-11-24 10:48:51 +00:00
main.qml
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-01-13 01:44:19 +00:00