legacy : lp:~rikmills/+git/labplot-upstream : Git : Code : Rik Mills

Get this branch:: git clone -b legacy https://git.launchpad.net/~rikmills/+git/labplot-upstream

You will only be able to propose a merge to another personal repository with the same name.

Branch information

44269c2... by l10n daemon script <email address hidden> on 2018-05-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"

c8917dd... by l10n daemon script <email address hidden> on 2018-05-10

GIT_SILENT made messages (after extraction)

6d1d0c6... by l10n daemon script <email address hidden> on 2017-11-11

GIT_SILENT made messages (after extraction)

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

GIT_SILENT made messages (after extraction)

b2c1ab9... by l10n daemon script <email address hidden> on 2017-05-12

GIT_SILENT made messages (after extraction)

6c3dd96... by Stefan Gerlach <email address hidden> on 2017-05-10

fix calculation of standard error

6826d57... by Stefan Gerlach <email address hidden> on 2017-05-10

fix calculation of adj. R^2

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

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"

46b7ff3... by l10n daemon script <email address hidden> on 2017-05-09

GIT_SILENT made messages (after extraction)

ca35478... by l10n daemon script <email address hidden> on 2017-05-06

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"

»