l10n daemon script 71c3f063bb 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"		2019-10-23 09:01:14 +02:00
..
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00
desktopgrid.cpp	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
desktopgrid.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
desktopgrid.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
desktopgrid_config.cpp	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
desktopgrid_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:01:14 +02:00
desktopgrid_config.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
desktopgrid_config.ui	desktop grid: add option to hide buttons	2015-10-29 23:36:10 +01:00
desktopgridconfig.kcfgc	Use KConfigXT in DesktopGrid effect	2012-09-15 11:24:11 +02:00
main.qml	desktop grid: use -/+ text buttons	2015-10-29 23:36:10 +01:00