l10n daemon script 97cbf48059 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"

2021-10-12 01:17:15 +00:00

..

pipewire

Modernize code

2021-07-09 08:53:14 +02:00

qt

SVN_SILENT made messages (.desktop file) - always resolve ours

2021-10-12 01:17:15 +00:00

xcb

SVN_SILENT made messages (.desktop file) - always resolve ours

2021-10-12 01:17:15 +00:00

CMakeLists.txt

Implement Wayland support using PipeWire and xdg-desktop-portal

2019-05-24 13:51:43 +02:00