kwin/plugins/platforms/wayland
l10n daemon script df306a4062 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"
2017-02-28 12:58:59 +01:00
..
CMakeLists.txt Move backends/ to plugins/platforms/ 2016-04-12 08:01:27 +02:00
egl_wayland_backend.cpp Support restarting the OpenGL compositor on Wayland 2016-07-20 14:08:23 +02:00
egl_wayland_backend.h Move backends/ to plugins/platforms/ 2016-04-12 08:01:27 +02: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 Move backends/ to plugins/platforms/ 2016-04-12 08:01:27 +02:00
scene_qpainter_wayland_backend.h Move backends/ to plugins/platforms/ 2016-04-12 08:01:27 +02:00
wayland.json SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-28 12:58:59 +01:00
wayland_backend.cpp [platforms/wayland] Use a ConfinedPointer if available 2016-12-08 19:49:05 +01:00
wayland_backend.h [platforms/wayland] Use a ConfinedPointer if available 2016-12-08 19:49:05 +01:00