kwin/effects/scale
l10n daemon script 6ce1152243 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-06 06:01:41 +01:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-06 06:01:41 +01:00
CMakeLists.txt [effects/scale] Port to JavaScript 2018-10-29 10:17:21 +02:00