l10n daemon script bb7051dd3a 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-18 05:38:34 +02:00
..
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00
slide.cpp	Update my last name	2019-09-29 17:03:25 +03:00
slide.h	Update my last name	2019-09-29 17:03:25 +03:00
slide.kcfg	[effects/slide] Disable "Slide docks"	2018-06-23 12:06:08 +03:00
slide_config.cpp	Update my last name	2019-09-29 17:03:25 +03:00
slide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-18 05:38:34 +02:00
slide_config.h	Update my last name	2019-09-29 17:03:25 +03:00
slide_config.ui	[effects/slide] Add "Slide desktop background" option	2018-06-19 12:35:53 +03:00
slideconfig.kcfgc