1
0
mirror of https://invent.kde.org/network/krfb synced 2024-07-08 12:05:49 +00:00
krfb/framebuffers/xcb
l10n daemon script 2fee3471f5 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"
2017-12-20 07:05:07 +01:00
..
CMakeLists.txt Implement XCB framebuffer plugin (port from x11) 2017-06-15 23:21:58 +02:00
krfb_framebuffer_xcb.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-20 07:05:07 +01:00
krfb_framebuffer_xcb.json SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-20 07:05:07 +01:00
xcb_framebuffer.cpp Implement XCB framebuffer plugin (port from x11) 2017-06-15 23:21:58 +02:00
xcb_framebuffer.h Implement XCB framebuffer plugin (port from x11) 2017-06-15 23:21:58 +02:00
xcb_framebufferplugin.cpp Implement XCB framebuffer plugin (port from x11) 2017-06-15 23:21:58 +02:00
xcb_framebufferplugin.h Implement XCB framebuffer plugin (port from x11) 2017-06-15 23:21:58 +02:00