l10n daemon script f0a021eae5 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-11-03 05:21:29 +01: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-11-03 05:21:29 +01:00
kwineffect.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
Messages.sh