l10n daemon script 3eaf1a9972 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-22 07:44:41 +02:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
desktopgrid.cpp	[effects] Don't register touch edges which don't exist	2017-08-24 13:38:55 +02:00
desktopgrid.h	Register touch screen edges in effects	2017-04-07 16:17:17 +02:00
desktopgrid.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
desktopgrid_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
desktopgrid_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-22 07:44:41 +02:00
desktopgrid_config.h
desktopgrid_config.ui
desktopgridconfig.kcfgc
main.qml