You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script fd702c3644 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"
5 years ago
..
CMakeLists.txt [effects/slide] Add 'Duration' option 7 years ago
slide.cpp Use more traditional doxygen style 5 years ago
slide.h [effects/slide] Simplify logic that forces blur and background contrast 6 years ago
slide.kcfg [effects/slide] Disable "Slide docks" 6 years ago
slide_config.cpp [effects] replace old slide effect with a new one 7 years ago
slide_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 5 years ago
slide_config.h Run clang-tidy with modernize-use-override check 5 years ago
slide_config.ui [effects/slide] Add "Slide desktop background" option 6 years ago
slideconfig.kcfgc [effects/slide] Add 'Duration' option 7 years ago