l10n daemon script afc80b580a 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-08-30 08:05:15 +02:00
..
CMakeLists.txt
fb_backend.cpp
fb_backend.h
fbdev.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-30 08:05:15 +02:00
logging.cpp
logging.h
scene_qpainter_fb_backend.cpp
scene_qpainter_fb_backend.h