l10n daemon script 3b3aa82f58 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-07-23 05:24:40 +02:00
..
CMakeLists.txt	Move QPainter compositor into plugin	2017-09-01 17:44:49 +02:00
fb_backend.cpp	fb_backend: use new udev function to detect framebuffer devices, if one is not set	2018-04-22 17:52:15 +02:00
fb_backend.h	Add a pure virtual method to Platform to describe the supported compositors	2017-10-18 21:19:43 +02:00
fbdev.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
logging.cpp
logging.h
scene_qpainter_fb_backend.cpp	fb_backend_qpainter_backend: Use logind to determine if the session is active.	2018-04-24 14:18:45 +02:00
scene_qpainter_fb_backend.h	Move QPainter compositor into plugin	2017-09-01 17:44:49 +02:00