l10n daemon script
|
9788f8f96b
|
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"
|
2016-08-05 11:37:14 +00:00 |
|
l10n daemon script
|
ae766f5839
|
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"
|
2016-08-04 12:30:52 +00:00 |
|
l10n daemon script
|
60c3bf9b90
|
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"
|
2016-06-22 16:33:04 +00:00 |
|
l10n daemon script
|
e55be85cf5
|
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"
|
2016-06-13 10:44:25 +00:00 |
|
Albert Vaca
|
0b5fbe00bb
|
Split plugins for sending and receiving notifications
CCMAIL: holger.k@elberer.de
|
2016-05-25 12:49:13 -06:00 |
|