l10n daemon script 7659261982 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-11-16 06:14:08 +01:00
..
package	Fix Connections warnings	2020-11-11 19:22:40 +00:00
CMakeLists.txt
effectsfilterproxymodel.cpp
effectsfilterproxymodel.h
kcm.cpp
kcm.h
kcm_kwin_effects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-11-16 06:14:08 +01:00
kwineffect.knsrc
Messages.sh