l10n daemon script 9e736e523a 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-08-15 05:48:31 +02:00
..
CMakeLists.txt	[effects/slide] Add 'Duration' option	2018-01-01 16:54:02 +02:00
slide.cpp	[effects/slide] Fix coding style	2018-07-21 14:44:37 +03:00
slide.h	[effects/slide] Fix coding style	2018-07-21 14:44:37 +03:00
slide.kcfg	[effects/slide] Disable "Slide docks"	2018-06-23 12:06:08 +03:00
slide_config.cpp	[effects] replace old slide effect with a new one	2018-02-16 06:09:27 +02:00
slide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-15 05:48:31 +02:00
slide_config.h	[effects/slide] Fix coding style	2018-07-21 14:44:37 +03:00
slide_config.ui	[effects/slide] Add "Slide desktop background" option	2018-06-19 12:35:53 +03:00
slideconfig.kcfgc	[effects/slide] Add 'Duration' option	2018-01-01 16:54:02 +02:00