l10n daemon script 71c3f063bb 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-10-23 09:01:14 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-17 05:29:51 +02:00
CMakeLists.txt	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
effectsfilterproxymodel.cpp	[kcmkwin] Rename EffectModel to EffectsModel	2019-03-18 13:10:51 +02:00
effectsfilterproxymodel.h
kcm.cpp	Make Desktop Effects KCM desktop file consistent	2019-09-16 00:04:15 +02:00
kcm.h	[kcmkwin] Rename EffectModel to EffectsModel	2019-03-18 13:10:51 +02:00
kcm_kwin_effects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-19 09:16:12 +02:00
kwineffect.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:01:14 +02:00
Messages.sh