Mathis Brüchert
|
737b26b40c
|
add icon
|
2020-02-06 18:23:21 +01:00 |
|
l10n daemon script
|
9b98493232
|
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-01-20 06:01:38 +01:00 |
|
l10n daemon script
|
ab190aa5da
|
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-12-28 05:25:20 +01:00 |
|
l10n daemon script
|
a7a5a3f003
|
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-12-04 05:36:25 +01:00 |
|
l10n daemon script
|
c6089a7b92
|
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-11-23 05:29:59 +01:00 |
|
l10n daemon script
|
78ce668071
|
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-11-20 05:40:05 +01:00 |
|
l10n daemon script
|
8e3a03beb4
|
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-11-16 05:03:41 +01:00 |
|
Bhushan Shah
|
0828700d3e
|
dialer: use QRC instead of the kpackage
And tidy up the code as well
|
2019-08-16 06:10:32 +00:00 |
|