l10n daemon script 71c3f063bb 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-23 09:01:14 +02:00
..
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00
slide.cpp
slide.h
slide.kcfg
slide_config.cpp
slide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:01:14 +02:00
slide_config.h
slide_config.ui
slideconfig.kcfgc