kwin/scripts/minimizeall
l10n daemon script a4d401c028 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"
2017-06-25 04:33:13 +02:00
..
contents/code Parse minimise all borders on the JS side 2017-01-17 13:46:17 +00:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-25 04:33:13 +02:00