l10n daemon script 86f90aa7cf 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"		2019-09-20 05:30:04 +02:00
..
package
CMakeLists.txt
effectsfilterproxymodel.cpp
effectsfilterproxymodel.h
kcm.cpp
kcm.h
kcm_kwin_effects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-20 05:30:04 +02:00
kwineffect.knsrc
Messages.sh