l10n daemon script ab85638946 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-01-04 06:12:32 +01:00
..
package
CMakeLists.txt
effectsfilterproxymodel.cpp
effectsfilterproxymodel.h
kcm.cpp	[KCM/Effects] Allow the user to know when the settings are set to default	2019-12-20 17:53:41 +01:00
kcm.h
kcm_kwin_effects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-04 06:12:32 +01:00
kwineffect.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
Messages.sh