l10n daemon script 91abcdbcfa 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-02-17 05:51:10 +01:00
..
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00
egl_wayland_backend.cpp	Fix crash when using kwin on windowed mode	2019-03-29 18:43:47 +01:00
egl_wayland_backend.h	Use more traditional doxygen style	2019-07-29 22:06:19 +03: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_wayland_backend.cpp	[platforms/wayland] Multi output support	2019-03-20 14:43:03 +01:00
scene_qpainter_wayland_backend.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
wayland.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-17 05:51:10 +01:00
wayland_backend.cpp	[platforms/wayland] Use xdg-shell stable protocol	2019-11-03 19:30:08 +01:00
wayland_backend.h	[platforms/wayland] Drop wl-shell support	2019-09-23 17:28:56 +03:00
wayland_output.cpp	[platforms/wayland] Always ack configure	2019-11-03 19:28:44 +01:00
wayland_output.h	[platforms/wayland] Drop wl-shell support	2019-09-23 17:28:56 +03:00