l10n daemon script 4e0aa9c78b 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-11-11 10:36:42 +01:00
..
CMakeLists.txt	Merge branch 'release/20.08' into master	2020-09-19 00:31:35 +02:00
krfb_framebuffer_pw.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-11-11 10:36:42 +01:00
pw_framebuffer.cpp	pipewire: fix version check	2020-10-23 14:59:08 +02:00
pw_framebuffer.h	PW framebuffer: support upcoming PipeWire 0.3	2020-02-26 14:22:27 +01:00
pw_framebufferplugin.cpp	Implement Wayland support using PipeWire and xdg-desktop-portal	2019-05-24 13:51:43 +02:00
pw_framebufferplugin.h	Implement Wayland support using PipeWire and xdg-desktop-portal	2019-05-24 13:51:43 +02:00