l10n daemon script
|
9f291d9ef7
|
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"
|
2015-10-02 10:15:24 +00:00 |
|
l10n daemon script
|
ba818c743c
|
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"
|
2015-09-29 12:23:45 +00:00 |
|
l10n daemon script
|
f9db1e0fa5
|
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"
|
2015-09-22 12:23:31 +00:00 |
|
Aleix Pol
|
13e3bee8f4
|
Merge branch 'stable'
|
2015-09-15 02:04:29 +02:00 |
|
Aleix Pol
|
b3425e114a
|
Another application desktop file to rename
|
2015-09-15 01:47:29 +02:00 |
|