l10n daemon script 6bb9f6db7b 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-17 13:07:36 +00:00
..
CMakeLists.txt	[backends/x11] Use BasicScreens implementation	2015-11-17 10:40:17 +01:00
logging.cpp	Change default logging category to QtCriticalMsg	2015-07-31 13:29:58 +02:00
logging.h	[wayland] Dedicate logging category for each of the backends	2015-05-05 17:47:03 +02:00
scene_qpainter_x11_backend.cpp	[wayland] Move X11WindowedQPainterBackend into backends/x11	2015-05-05 15:23:53 +02:00
scene_qpainter_x11_backend.h	[wayland] Move X11WindowedQPainterBackend into backends/x11	2015-05-05 15:23:53 +02:00
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-17 13:07:36 +00:00
x11windowed_backend.cpp	[backends/x11] Use BasicScreens implementation	2015-11-17 10:40:17 +01:00
x11windowed_backend.h	[backends/x11] Use BasicScreens implementation	2015-11-17 10:40:17 +01:00