l10n daemon script c10fe06d06 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"		2020-06-18 05:44:57 +02:00
..
CMakeLists.txt
egl_x11_backend.cpp
egl_x11_backend.h
logging.cpp
logging.h
scene_qpainter_x11_backend.cpp
scene_qpainter_x11_backend.h
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
x11windowed_backend.cpp	Port KWin to KWaylandServer	2020-04-30 12:56:08 +02:00
x11windowed_backend.h
x11windowed_output.cpp	[platforms/x11] Fix valigrind warning copying window icon for windowed mode	2020-05-01 16:13:40 +01:00
x11windowed_output.h