l10n daemon script 54fd606e82 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-10 06:40:00 +02:00
..
CMakeLists.txt	Implement XCB framebuffer plugin (port from x11)	2017-06-15 23:21:58 +02:00
krfb_framebuffer_xcb.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:40:00 +02:00
xcb_framebuffer.cpp	Consistently use override	2018-07-17 14:40:23 +02:00
xcb_framebuffer.h	Use more explicit	2018-07-17 14:45:09 +02:00
xcb_framebufferplugin.cpp	Implement XCB framebuffer plugin (port from x11)	2017-06-15 23:21:58 +02:00
xcb_framebufferplugin.h	Consistently use override	2018-07-17 14:40:23 +02:00