kwin/effects/squash/package
l10n daemon script ba0b34c755 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-11-22 06:02:11 +01:00
..
contents/code [effects/squash] Try to reverse previous active animations 2018-11-17 13:44:20 +02:00
CMakeLists.txt Fix test of scriptedeffectsloader when run from build directory without install 2018-11-07 09:34:18 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00