kwin/kcmkwin/kwineffects
l10n daemon script 382077f872 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-10 05:36:05 +02:00
..
package Update my last name 2019-09-29 17:03:25 +03:00
CMakeLists.txt
effectsfilterproxymodel.cpp Update my last name 2019-09-29 17:03:25 +03:00
effectsfilterproxymodel.h Update my last name 2019-09-29 17:03:25 +03:00
kcm.cpp Update my last name 2019-09-29 17:03:25 +03:00
kcm.h Update my last name 2019-09-29 17:03:25 +03:00
kcm_kwin_effects.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-10 05:36:05 +02:00
kwineffect.knsrc
Messages.sh