mirror of
https://invent.kde.org/network/krfb
synced 2024-07-03 00:18:36 +00:00
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" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
krfb_framebuffer_xcb.json | ||
xcb_framebuffer.cpp | ||
xcb_framebuffer.h | ||
xcb_framebufferplugin.cpp | ||
xcb_framebufferplugin.h |