l10n daemon script
|
866dfb4e89
|
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"
|
2021-01-14 07:04:00 +01:00 |
|
l10n daemon script
|
a1c0d43deb
|
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"
|
2020-07-23 06:10:20 +02:00 |
|
l10n daemon script
|
c10fe06d06
|
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"
|
2020-06-18 05:44:57 +02:00 |
|
l10n daemon script
|
0e117c49a1
|
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"
|
2020-06-17 14:12:29 +02:00 |
|
l10n daemon script
|
cfd296326b
|
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"
|
2019-10-23 05:33:32 +02:00 |
|
l10n daemon script
|
fd702c3644
|
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"
|
2019-09-17 05:29:51 +02:00 |
|
l10n daemon script
|
9c0a71c37f
|
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"
|
2019-07-13 05:18:09 +02:00 |
|
Vlad Zagorodniy
|
fa6fa27935
|
[effects] Move the Desktop Cube Animation effect to its own directory
Summary: Just little tidying.
Reviewers: #kwin, davidedmundson
Reviewed By: #kwin, davidedmundson
Subscribers: kwin
Tags: #kwin
Differential Revision: https://phabricator.kde.org/D15725
|
2018-09-28 20:07:32 +03:00 |
|