l10n daemon script 3b3aa82f58 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"		2018-07-23 05:24:40 +02:00
..
CMakeLists.txt
desktopgrid.cpp	Merge branch 'Plasma/5.13'	2018-07-11 16:42:09 +03:00
desktopgrid.h	[effects] Ignore previous state of WindowForceBlurRole	2018-06-19 15:23:41 +03:00
desktopgrid.kcfg
desktopgrid_config.cpp
desktopgrid_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
desktopgrid_config.h
desktopgrid_config.ui
desktopgridconfig.kcfgc
main.qml