l10n daemon script bd3083e81f 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"		2016-01-30 09:40:55 +00:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
desktopgrid.cpp	[effects] Disable more effects while screen is locked	2015-11-26 08:30:29 +01:00
desktopgrid.h	desktop grid: less branches for isOnAllDesktops	2015-10-29 23:36:10 +01:00
desktopgrid.kcfg	desktop grid: add option to hide buttons	2015-10-29 23:36:10 +01:00
desktopgrid_config.cpp
desktopgrid_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-30 09:40:55 +00:00
desktopgrid_config.h
desktopgrid_config.ui	desktop grid: add option to hide buttons	2015-10-29 23:36:10 +01:00
desktopgridconfig.kcfgc
main.qml	desktop grid: use -/+ text buttons	2015-10-29 23:36:10 +01:00