kwin/plugins/platforms/wayland
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
egl_wayland_backend.h
logging.cpp
logging.h
scene_qpainter_wayland_backend.cpp
scene_qpainter_wayland_backend.h
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