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

2020-07-24 05:49:48 +02:00

..

x11

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

2020-07-24 05:49:48 +02:00

xdp

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

2020-07-24 05:49:48 +02:00

CMakeLists.txt

Implement Wayland support using PipeWire and xdg-desktop-portal

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