kwin/plugins/platforms
l10n daemon script b160c5babb 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-03-25 04:37:53 +01:00
..
drm [DrmBackend] Straighten out EGL surface buffer release logic on page flip 2017-03-17 20:41:46 +01:00
fbdev SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-25 04:37:53 +01:00
hwcomposer SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-07 14:39:25 +01:00
virtual SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-28 12:58:59 +01:00
wayland Add support for pointer gestures to nested Wayland platform 2017-03-18 14:39:30 +01:00
x11 SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-07 14:39:25 +01:00
CMakeLists.txt