l10n daemon script e54baa8d73 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-02-22 05:20:00 +01:00
..
CMakeLists.txt	[effects/slide] Add 'Duration' option	2018-01-01 16:54:02 +02:00
slide.cpp	[effects] replace old slide effect with a new one	2018-02-16 06:09:27 +02:00
slide.h	[effects] replace old slide effect with a new one	2018-02-16 06:09:27 +02:00
slide.kcfg	[effects] replace old slide effect with a new one	2018-02-16 06:09:27 +02: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-02-22 05:20:00 +01:00
slide_config.h	[effects] replace old slide effect with a new one	2018-02-16 06:09:27 +02:00
slide_config.ui	[effects] replace old slide effect with a new one	2018-02-16 06:09:27 +02:00
slideconfig.kcfgc	[effects/slide] Add 'Duration' option	2018-01-01 16:54:02 +02:00