l10n daemon script
|
ab93807baf
|
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-05-25 10:12:32 +00:00 |
|
l10n daemon script
|
aa91c6bbd6
|
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-04-10 10:24:31 +00:00 |
|
l10n daemon script
|
8349588c77
|
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-04-06 09:54:12 +00:00 |
|
l10n daemon script
|
8e729f3ab2
|
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-04-04 11:03:11 +00:00 |
|
l10n daemon script
|
ff9d6b336b
|
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-04-03 10:36:58 +00:00 |
|
l10n daemon script
|
cda092d2bb
|
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-03-31 13:16:15 +00:00 |
|
l10n daemon script
|
92cd693566
|
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-03-29 09:58:52 +00:00 |
|
l10n daemon script
|
98bb1ee564
|
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-03-27 09:50:58 +00:00 |
|
l10n daemon script
|
2cb090d2c9
|
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-03-26 10:12:56 +00:00 |
|
l10n daemon script
|
08eaaf11e1
|
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-03-25 09:09:47 +00:00 |
|
l10n daemon script
|
d1d2677746
|
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-03-23 04:18:37 +00:00 |
|
l10n daemon script
|
c66fe08382
|
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-03-22 04:16:27 +00:00 |
|
l10n daemon script
|
4060e048f5
|
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-03-21 04:21:58 +00:00 |
|
l10n daemon script
|
f8ba80c7f3
|
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-03-20 04:31:37 +00:00 |
|
Albert Vaca
|
18ba161f17
|
Fully replaced KDED for autostart + dbus activation, so we work outside KDE
|
2015-02-23 22:12:45 -08:00 |
|