kwin/plugins/platforms/fbdev
l10n daemon script 9ba26510d0 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 06:05:03 +02:00
..
CMakeLists.txt
fb_backend.cpp [platforms/fbdev] Attempt to set the framebuffer color layout on the framebuffer device 2018-08-13 17:37:24 +03:00
fb_backend.h [platforms/fbdev] Attempt to set the framebuffer color layout on the framebuffer device 2018-08-13 17:37:24 +03:00
fbdev.json SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-24 06:05:03 +02:00
logging.cpp
logging.h
scene_qpainter_fb_backend.cpp
scene_qpainter_fb_backend.h