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

2018-10-24 08:12:16 +02:00

..

qt

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

2018-10-24 08:12:16 +02:00

xcb

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

2018-10-24 08:12:16 +02:00

CMakeLists.txt

Implement XCB framebuffer plugin (port from x11)

2017-06-15 23:21:58 +02:00