kwin/plugins/platforms
l10n daemon script 9ba26510d0 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-10-24 06:05:03 +02:00
..
drm SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-24 06:05:03 +02:00
fbdev SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-24 06:05:03 +02:00
hwcomposer SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-24 06:05:03 +02:00
virtual SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-24 06:05:03 +02:00
wayland SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-24 06:05:03 +02:00
x11 SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-24 06:05:03 +02:00
CMakeLists.txt Require libinput and udev 2018-02-04 15:00:42 +01:00