kstars-bleeding:Applications/17.08

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

1370138... by l10n daemon script <email address hidden> on 2017-10-05

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"

c59c479... by l10n daemon script <email address hidden> on 2017-10-04

GIT_SILENT made messages (after extraction)

72d627f... by l10n daemon script <email address hidden> on 2017-09-19

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"

4f57aca... by l10n daemon script <email address hidden> on 2017-09-18

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"

c18bd82... by l10n daemon script <email address hidden> on 2017-09-15

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"

946cca4... by l10n daemon script <email address hidden> on 2017-09-11

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"

1a3d43f... by l10n daemon script <email address hidden> on 2017-09-11

GIT_SILENT made messages (after extraction)

f8570ed... by l10n daemon script <email address hidden> on 2017-08-27

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"

57f046e... by l10n daemon script <email address hidden> on 2017-08-13

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"

ddd57d3... by l10n daemon script <email address hidden> on 2017-08-08

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"