kwin/scripts/enforcedeco
l10n daemon script c240755dee 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"
2016-06-23 23:41:42 +00:00
..
contents/code Add a script to enforce window decorations for GTK windows 2014-07-03 16:03:22 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-06-23 23:41:42 +00:00