l10n daemon script 1f6e615ec0 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-10-05 06:16:34 +02:00
..
CMakeLists.txt
thumbnailaside.cpp
thumbnailaside.h
thumbnailaside.kcfg
thumbnailaside_config.cpp	Port some KCMs away from deprecated KShortcutsEditor::undoChanges()	2020-09-24 07:52:44 +00:00
thumbnailaside_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-05 06:16:34 +02:00
thumbnailaside_config.h
thumbnailaside_config.ui
thumbnailasideconfig.kcfgc