kwin/packageplugins
l10n daemon script 4bcd809664 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"
2018-10-02 05:58:17 +02:00
..
aurorae SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
decoration SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
effect SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-02 05:58:17 +02:00
scripts SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
windowswitcher Fix minor EBN issues 2018-08-29 21:02:16 +03:00
CMakeLists.txt [effects] Make scripted effects GHNS-able 2018-09-28 20:17:30 +03:00