kwin/kcmkwin/kwineffects
l10n daemon script f0a021eae5 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-11-03 05:21:29 +01:00
..
package Update my last name 2019-09-29 17:03:25 +03:00
CMakeLists.txt Undo some recent cmake changes 2019-09-18 13:50:52 +03:00
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-11-03 05:21:29 +01:00
kwineffect.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
Messages.sh