kwin/kcmkwin/kwineffects
l10n daemon script ee60653640 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-05-08 05:51:51 +02:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-19 05:59:50 +01:00
CMakeLists.txt [kcmkwin] Split out Desktop Effects KCM 2019-03-18 13:08:32 +02:00
effectsfilterproxymodel.cpp [kcmkwin] Rename EffectModel to EffectsModel 2019-03-18 13:10:51 +02:00
effectsfilterproxymodel.h [kcmkwin] Split out Desktop Effects KCM 2019-03-18 13:08:32 +02:00
kcm.cpp [kcmkwin] Rename EffectModel to EffectsModel 2019-03-18 13:10:51 +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-05-08 05:51:51 +02:00
kwineffect.knsrc [kcmkwin] Split out Desktop Effects KCM 2019-03-18 13:08:32 +02:00
Messages.sh [kcmkwin] Split out Desktop Effects KCM 2019-03-18 13:08:32 +02:00