kwin/effects/fadedesktop
l10n daemon script fd702c3644 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-09-17 05:29:51 +02:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-09-17 05:29:51 +02:00
CMakeLists.txt Fix test of scriptedeffectsloader when run from build directory without install 2018-11-07 09:34:18 +01:00