l10n daemon script
|
64a58b210c
|
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-03-08 10:37:25 +00:00 |
|
l10n daemon script
|
6464f22534
|
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-03-04 09:12:16 +00:00 |
|
l10n daemon script
|
0f3198644e
|
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-03-01 11:55:01 +00:00 |
|
l10n daemon script
|
e1e58332e7
|
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-29 11:17:43 +00:00 |
|
l10n daemon script
|
361204cbee
|
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-27 09:29:41 +00:00 |
|
l10n daemon script
|
3847dc6d91
|
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-24 09:12:03 +00:00 |
|
l10n daemon script
|
78cee23be3
|
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-22 10:53:01 +00:00 |
|
l10n daemon script
|
9e1b7dab46
|
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-21 09:52:09 +00:00 |
|
l10n daemon script
|
82c351cb04
|
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-20 09:50:14 +00:00 |
|
l10n daemon script
|
57fbaa0597
|
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-19 09:24:58 +00:00 |
|
Marco Martin
|
3224f87c15
|
default theme follows color scheme
new breeze-light that is just as the old one
REVIEW:127085
Change-Id: Iab4f79fff172e885f8188e0d1bbf2dea266cb9e3
|
2016-02-17 12:08:31 +01:00 |
|