l10n daemon script 47b27b1885 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-06-24 07:14:49 +02:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
desktopgrid.cpp	[effects/desktopgrid] Enable blur behind windows	2018-05-01 23:01:55 +02:00
desktopgrid.h	[effects/desktopgrid] Enable blur behind windows	2018-05-01 23:01:55 +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-06-24 07:14:49 +02:00
desktopgrid_config.h	Use Q_SLOTS and Q_SIGNALS instead of slots and signals	2013-07-24 09:46:54 +02:00
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