l10n daemon script b33a878e45 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"		2015-11-02 11:12:07 +00:00
..
CMakeLists.txt
fb_backend.cpp
fb_backend.h
fbdev.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-02 11:12:07 +00:00
logging.cpp
logging.h
scene_qpainter_fb_backend.cpp
scene_qpainter_fb_backend.h
screens_fb.cpp
screens_fb.h