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
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
slide_config.cpp
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
slideconfig.kcfgc