Commit Graph

56 Commits (230b8d8ba7060323d1aa6d5766cc95a5f45cfcf5)

Author SHA1 Message Date
l10n daemon script e6f275939a 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"
7 years ago
Michail Vourlakos 036bccb6bd show active layouts in menu with bold 7 years ago
Michail Vourlakos f9afa1bc1f move completely to containmentactions 7 years ago
Michail Vourlakos 5660e0ec9c preparing layouts menu in containmentactions 7 years ago
Michail Vourlakos 82e77f7b23 more improvements to containmentactions 7 years ago
Michail Vourlakos d3756e0ce1 add containmentactions 7 years ago