kwin/effects/glide
l10n daemon script 430ca2a33e 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-06-18 08:32:20 +02:00
..
CMakeLists.txt Reduce the amount of objects that are compiled several times 2020-04-02 00:41:55 +02:00
glide.cpp Update my email address 2020-01-14 18:17:18 +02:00
glide.h Update my email address 2020-01-14 18:17:18 +02:00
glide.kcfg
glide_config.cpp
glide_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
glide_config.h
glide_config.ui
glideconfig.kcfgc