l10n daemon script 60f7e0efbb 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"

2022-06-30 02:46:20 +00:00

..

pipewire

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

2022-06-30 02:46:20 +00:00

qt

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

2022-06-30 02:46:20 +00:00

xcb

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

2022-06-30 02:46:20 +00:00

CMakeLists.txt

Implement Wayland support using PipeWire and xdg-desktop-portal

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