l10n daemon script c10fe06d06 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"		2020-06-18 05:44:57 +02:00
..
CMakeLists.txt	Reduce the amount of objects that are compiled several times	2020-04-02 00:41:55 +02:00
slide.cpp	Update my email address	2020-01-14 18:17:18 +02:00
slide.h	Update my email address	2020-01-14 18:17:18 +02:00
slide.kcfg	[effects/slide] Disable "Slide docks"	2018-06-23 12:06:08 +03:00
slide_config.cpp	Update my email address	2020-01-14 18:17:18 +02:00
slide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
slide_config.h	Update my email address	2020-01-14 18:17:18 +02: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