l10n daemon script fd702c3644 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-09-17 05:29:51 +02:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
desktopgrid.cpp	Remove disabled TabGroup feature	2019-09-14 10:58:48 +02:00
desktopgrid.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
desktopgrid.kcfg
desktopgrid_config.cpp
desktopgrid_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-17 05:29:51 +02:00
desktopgrid_config.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
desktopgrid_config.ui
desktopgridconfig.kcfgc
main.qml