l10n daemon script db12cb6742 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"		2019-06-21 05:35:42 +02:00
..
CMakeLists.txt	Build platform plugins in correct sub directory of build dir	2018-12-13 19:36:28 +01:00
fb_backend.cpp	[platforms/fbdev] Port to AbstractOutput	2019-06-06 22:36:40 +02:00
fb_backend.h	[platforms/x11/standalone] Port to AbstractOutput	2019-06-13 11:39:25 +02:00
fbdev.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-21 05:35:42 +02:00
logging.cpp	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
logging.h	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
scene_qpainter_fb_backend.cpp	[platforms/fbdev] Port to AbstractOutput	2019-06-06 22:36:40 +02:00
scene_qpainter_fb_backend.h	[platforms/fbdev] Port to AbstractOutput	2019-06-06 22:36:40 +02:00