l10n daemon script a1c0d43deb 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-07-23 06:10:20 +02:00
..
CMakeLists.txt
glide.cpp
glide.h
glide.kcfg
glide_config.cpp
glide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 06:10:20 +02:00
glide_config.h
glide_config.ui
glideconfig.kcfgc