l10n daemon script
|
f0eb32c350
|
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-10-19 09:02:51 +00:00 |
|
l10n daemon script
|
3be06839a8
|
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-10-11 13:08:45 +00:00 |
|
l10n daemon script
|
ec0ca3976d
|
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-09-29 12:27:06 +00:00 |
|
l10n daemon script
|
2664b99864
|
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-30 10:03: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
|
f6724de704
|
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-02-14 09:18:22 +00:00 |
|
l10n daemon script
|
5eb9a54bcc
|
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-02-05 09:16:28 +00:00 |
|
l10n daemon script
|
ce766fb7ff
|
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-11-19 12:12:59 +00:00 |
|
l10n daemon script
|
fc2bd97e69
|
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-11-17 12:54:36 +00:00 |
|
l10n daemon script
|
f92534583d
|
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-11-13 10:40:06 +00:00 |
|
l10n daemon script
|
0145c837db
|
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-11-11 10:30:30 +00:00 |
|
l10n daemon script
|
d9c8a7865e
|
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-11-07 21:12:54 +00:00 |
|
l10n daemon script
|
e424bcec1a
|
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-11-04 17:00:05 +00:00 |
|
l10n daemon script
|
633952b638
|
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-27 12:30:00 +00:00 |
|
l10n daemon script
|
dda5ec5385
|
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-26 03:37:32 +00:00 |
|
l10n daemon script
|
4239b0525b
|
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-25 03:57:27 +00:00 |
|
l10n daemon script
|
c0576f76b1
|
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-13 12:45:08 +00:00 |
|
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 |
|