Applications/18.12 : lp:~trebelnik-stefina/cinnamon-test/+git/k3b : Git : Code : Cinnamon testing

Get this branch:: git clone -b Applications/18.12 https://git.launchpad.net/~trebelnik-stefina/cinnamon-test/+git/k3b

Branch information

c7705ed... by Christoph Feck <email address hidden> on 2019-02-28

GIT_SILENT Upgrade KDE Applications version to 18.12.3.

6bfcee8... by l10n daemon script <email address hidden> on 2019-02-24

GIT_SILENT made messages (after extraction)

d342bfc... by l10n daemon script <email address hidden> on 2019-02-09

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"

e228b46... by Christoph Feck <email address hidden> on 2019-02-03

GIT_SILENT Upgrade KDE Applications version to 18.12.2.

c4f210e... by l10n daemon script <email address hidden> on 2019-01-20

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"

d0a981c... by l10n daemon script <email address hidden> on 2019-01-20

GIT_SILENT made messages (after extraction)

844d24b... by Christoph Feck <email address hidden> on 2019-01-03

GIT_SILENT Upgrade KDE Applications version to 18.12.1.

7849412... by l10n daemon script <email address hidden> on 2018-12-12

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"

ce22ece... by Christoph Feck <email address hidden> on 2018-12-04

GIT_SILENT Upgrade KDE Applications version to 18.12.0.

fd7a997... by Christoph Feck <email address hidden> on 2018-11-26

GIT_SILENT Upgrade KDE Applications version to 18.11.90.

»