kwin/kcmkwin/kwineffects
l10n daemon script 7659261982 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-11-16 06:14:08 +01:00
..
package Fix Connections warnings 2020-11-11 19:22:40 +00:00
CMakeLists.txt
effectsfilterproxymodel.cpp Prettify license headers 2020-08-07 19:57:56 +00:00
effectsfilterproxymodel.h Prettify license headers 2020-08-07 19:57:56 +00:00
kcm.cpp Add missing includes 2020-11-08 13:36:32 +00:00
kcm.h Prettify license headers 2020-08-07 19:57:56 +00:00
kcm_kwin_effects.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-11-16 06:14:08 +01:00
kwineffect.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-30 06:16:48 +02:00
Messages.sh