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

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

Branch information

9d01427... by Christoph Feck <email address hidden> on 2018-11-02

GIT_SILENT Upgrade KDE Applications version to 18.08.3.

MetaItemModel: Fix Qt assertion in adding rows

Summary:
We need the row count to be correct, and since flat models sometimes have no rows, places.count is not a valid row

BUG: 399753

5cb80d6... by l10n daemon script <email address hidden> on 2018-10-07

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"

928748e... by Christoph Feck <email address hidden> on 2018-10-03

GIT_SILENT Upgrade KDE Applications version to 18.08.2.

5573aac... by Christoph Feck <email address hidden> on 2018-08-31

GIT_SILENT Upgrade KDE Applications version to 18.08.1.

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

73fe5d2... by l10n daemon script <email address hidden> on 2018-08-27

GIT_SILENT made messages (after extraction)

afeaef8... by l10n daemon script <email address hidden> on 2018-08-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"

7592787... by l10n daemon script <email address hidden> on 2018-08-19

GIT_SILENT made messages (after extraction)

c10c566... by Christoph Feck <email address hidden> on 2018-08-06

GIT_SILENT Upgrade KDE Applications version to 18.08.0.

»