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 a35792e59d 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"
4 years ago
..
package [kcm/effects] Clip ListView 5 years ago
CMakeLists.txt
Messages.sh
effectsfilterproxymodel.cpp
effectsfilterproxymodel.h
kcm.cpp
kcm.h
kcm_kwin_effects.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
kwineffect.knsrc