kwin/plugins/platforms
l10n daemon script e68356831b 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"
2018-04-22 05:43:11 +02:00
..
drm drm backend: choose correct EGL config with mesa-18 2018-04-05 01:29:17 +03:00
fbdev SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-13 07:01:42 +01:00
hwcomposer SVN_SILENT made messages (.desktop file) - always resolve ours 2018-04-22 05:43:11 +02:00
virtual [platforms/virtual] Make VirtualOutput non-copyable 2018-04-16 02:48:48 +03:00
wayland SVN_SILENT made messages (.desktop file) - always resolve ours 2018-04-22 05:43:11 +02:00
x11 SVN_SILENT made messages (.desktop file) - always resolve ours 2018-04-22 05:43:11 +02:00
CMakeLists.txt Require libinput and udev 2018-02-04 15:00:42 +01:00