kwin/plugins/platforms/fbdev
l10n daemon script 91abcdbcfa 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-02-17 05:51:10 +01:00
..
CMakeLists.txt
fb_backend.cpp
fb_backend.h
fbdev.json SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-17 05:51:10 +01:00
logging.cpp
logging.h
scene_qpainter_fb_backend.cpp
scene_qpainter_fb_backend.h