kwin/scripts/synchronizeskipswitcher
l10n daemon script 7c747e1591 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"
2015-04-24 09:53:59 +00:00
..
contents/code Script to synchronize skip switcher with skip taskbar 2012-02-29 18:57:28 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-24 09:53:59 +00:00