kwin/kcmkwin/kwineffects
l10n daemon script a1c0d43deb 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-07-23 06:10:20 +02:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-07-23 06:10:20 +02:00
CMakeLists.txt Undo some recent cmake changes 2019-09-18 13:50:52 +03:00
effectsfilterproxymodel.cpp Update my email address 2020-01-14 18:17:18 +02:00
effectsfilterproxymodel.h Update my email address 2020-01-14 18:17:18 +02:00
kcm.cpp Update my email address 2020-01-14 18:17:18 +02:00
kcm.h Update my email address 2020-01-14 18:17:18 +02:00
kcm_kwin_effects.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-07-23 06:10:20 +02:00
kwineffect.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2020-07-23 06:10:20 +02:00
Messages.sh