GitLab

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"

(cherry picked from commit 677fbebd)

They do not belong to an user-facing documentation, but rather to
separate download/build development pages.

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"

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"

(cherry picked from commit 0901406f)

(cherry picked from commit 1817f22e)

Summary: When using fractional scaling, icons on the top are blurred. This patch fixes the issue.

Test Plan: No side effects.

Reviewers: #kde_games, yurchor

Reviewed By: yurchor

Subscribers: yurchor, kde-games-devel

Differential Revision: https://phabricator.kde.org/D29659

(cherry picked from commit 7f376769)

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"

Summary:
Palapeli version was increased to 2.1 "recently" and not so many changes have been done since them
so asserting the verison number is stuck in the past is a bit too much, but still having it move with
each new release is important for reproducibility of issues, etc. so compromise and append the version at the end

Reviewers: #kde_games

Subscribers: kde-games-devel

Differential Revision: https://phabricator.kde.org/D27748