l10n daemon script f4069deb5c 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-10-13 12:48:07 +00:00
..
CMakeLists.txt	Make X11_XCB a build dependency of X11 windowed backend	2015-08-12 11:39:20 +02: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
scene_qpainter_x11_backend.h
screens_x11windowed.cpp
screens_x11windowed.h
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-13 12:48:07 +00:00
x11windowed_backend.cpp	[backends/x11] Allow grab keyboard/pointer	2015-09-30 07:40:45 +02:00
x11windowed_backend.h	[backends/x11] Allow grab keyboard/pointer	2015-09-30 07:40:45 +02:00