l10n daemon script
|
42e5ffe5ee
|
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-15 10:35:12 +00:00 |
|
l10n daemon script
|
3dac19023c
|
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-02 10:51:53 +00:00 |
|
l10n daemon script
|
e965b8c647
|
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-01-26 10:21:15 +00:00 |
|
l10n daemon script
|
bd10d78e1e
|
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-01-22 09:52:02 +00:00 |
|
l10n daemon script
|
3908c521ca
|
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-01-13 10:35:10 +00:00 |
|
l10n daemon script
|
a1feac929b
|
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-12-16 09:05:14 +00:00 |
|
l10n daemon script
|
9d96277a5e
|
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-12-09 09:05:50 +00:00 |
|
l10n daemon script
|
4a6cc3319e
|
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-12-08 10:05:59 +00:00 |
|
l10n daemon script
|
3c90a5d835
|
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-12-07 10:15:57 +00:00 |
|
l10n daemon script
|
8d9fd0846a
|
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-12-06 09:14:26 +00:00 |
|
l10n daemon script
|
26ca3e43b2
|
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-12-05 09:08:31 +00:00 |
|
l10n daemon script
|
8a21e2bb27
|
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-12-04 09:12:31 +00:00 |
|
l10n daemon script
|
67a6976f8c
|
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-12-03 09:40:56 +00:00 |
|
Sebastian Kügler
|
b2d4f3a6bc
|
Add basic plasmoid as example for developerguide
|
2015-12-03 02:45:04 +01:00 |
|