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"

Aleix Pol Gonzalez authored Dec 12, 2022 and Aleix Pol Gonzalez committed Jan 12, 2023

Rather than using pipewire directly, we can use this framework which
allows us to share a bunch of code with Plasma.

(cherry picked from commit ebbd8b98)

(cherry picked from commit 97ba8f61)

(cherry picked from commit fa2d8275)

(cherry picked from commit 0e8fc32f)

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 de4dcbbc)

(cherry picked from commit 7f26fdec)

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"

Actually remove the WId member from the abtract framebuffer class and use the member in xcbframebuffer

qtframebuffer also uses the WId so add a member there

The wid is only relevant for the xcb framebuffer

We can just query it there, no need to pass it around everywhere

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

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"