Commit Graph

54 Commits (556ecae3e2067c2ec7ef6ccbaff6c26c04fe0a67)

Author SHA1 Message Date
l10n daemon script be779e2674 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"
8 years ago
l10n daemon script aaf8cc1d1a 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"
8 years ago
l10n daemon script fbaef27a64 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"
8 years ago
Michail Vourlakos 7c07385c10 fix #453,substitute absolute build path references
--fixes the kdesrc-build installation
8 years ago