l10n daemon script 40dfbb82a7 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-01-31 05:53:55 +01:00
..
CMakeLists.txt
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
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-01-31 05:53:55 +01:00
slide_config.h	Update my email address	2020-01-14 18:17:18 +02:00
slide_config.ui
slideconfig.kcfgc