l10n daemon script f1bbe935d3 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-08-07 05:12:10 +02:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
desktopgrid.cpp	Port away from deprecated headers	2019-07-09 23:59:07 +03:00
desktopgrid.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
desktopgrid.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
desktopgrid_config.cpp	[effects] Port to new connect syntax	2019-01-26 01:22:06 +02:00
desktopgrid_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +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