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 |
|
l10n daemon script
|
d42bcb25a2
|
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-19 11:56:19 +00:00 |
|
l10n daemon script
|
933cbd5bfd
|
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-13 10:31:01 +00:00 |
|
l10n daemon script
|
5795e27191
|
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-10 11:33:23 +00:00 |
|
l10n daemon script
|
af97d4476c
|
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-08 12:50:45 +00:00 |
|
l10n daemon script
|
e6a759a071
|
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-01 12:31:29 +00:00 |
|
l10n daemon script
|
f86c5e4a4c
|
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-07-03 10:06:32 +00:00 |
|
l10n daemon script
|
7d514bdd29
|
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-06-30 13:47:48 +00:00 |
|
l10n daemon script
|
f075da1eab
|
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-06-29 10:29:47 +00:00 |
|
l10n daemon script
|
320779b719
|
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-06-25 10:38:53 +00:00 |
|
l10n daemon script
|
69d8a40aa6
|
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-06-24 10:38:32 +00:00 |
|
l10n daemon script
|
d8b3d829e4
|
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-06-20 11:56:14 +00:00 |
|
l10n daemon script
|
7fb21dec12
|
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-06-19 10:41:31 +00:00 |
|
l10n daemon script
|
700eff446e
|
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-06-18 11:49:24 +00:00 |
|
l10n daemon script
|
0899923dbc
|
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-06-16 13:33:29 +00:00 |
|
l10n daemon script
|
d4074b42fa
|
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-06-15 09:58:46 +00:00 |
|
Aleix Pol
|
5ccdf931a9
|
Add desktop file for kcapp
|
2015-06-13 20:35:09 +02:00 |
|