kstars-bleeding

kstars-bleeding:Applications/17.04

Git
lp:kstars-bleeding
Applications/17.04

Last commit made on 2017-06-21

Get this branch:: git clone -b Applications/17.04 https://git.launchpad.net/kstars-bleeding

Branch merges

Branch information

Name:: Applications/17.04

Repository:: lp:kstars-bleeding

Recent commits

ac3aa9c... by l10n daemon script <email address hidden> on 2017-06-21

GIT_SILENT made messages (after extraction)

33c3f4f... by l10n daemon script <email address hidden> on 2017-06-06

GIT_SILENT made messages (after extraction)

15601f9... by l10n daemon script <email address hidden> on 2017-05-30

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"

acbf9a1... by l10n daemon script <email address hidden> on 2017-05-30

GIT_SILENT made messages (after extraction)

35c8145... by l10n daemon script <email address hidden> on 2017-05-28

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"

0f50dfc... by l10n daemon script <email address hidden> on 2017-05-14

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"

42d048c... by l10n daemon script <email address hidden> on 2017-05-14

GIT_SILENT made messages (after extraction)

ef66fff... by l10n daemon script <email address hidden> on 2017-04-23

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"

1a1c9c0... by l10n daemon script <email address hidden> on 2017-04-23

GIT_SILENT made messages (after extraction)

9f63b1d... by l10n daemon script <email address hidden> on 2017-04-14

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"

»