l10n daemon script b160c5babb 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"		2017-03-25 04:37:53 +01:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
desktopgrid.cpp	[desktopgrid] Don't manipulate virtual desktop of desktop window	2016-11-04 09:32:24 +01:00
desktopgrid.h	Revert "desktop grid: zoom hovered window"	2016-03-24 14:52:03 +01:00
desktopgrid.kcfg	desktop grid: add option to hide buttons	2015-10-29 23:36:10 +01:00
desktopgrid_config.cpp	[effects] Clean up saving of DesktopGrid config	2016-11-15 07:19:52 +01:00
desktopgrid_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 04:37:53 +01: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