kwin/backends
l10n daemon script 6bb9f6db7b 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"
2015-11-17 13:07:36 +00:00
..
drm Move egl context creation into AbstractEglContext 2015-11-16 09:08:14 +01:00
fbdev [backends/fbdev] Use BaseScreens implementation 2015-11-17 10:46:32 +01:00
hwcomposer [backends/hwcomposer] Base HwcomposerScreens on BasicScreens 2015-11-17 10:49:09 +01:00
virtual Move egl context creation into AbstractEglContext 2015-11-16 09:08:14 +01:00
wayland [backends/wayland] Use BasicScreens implementation 2015-11-17 10:43:10 +01:00
x11 SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-17 13:07:36 +00:00
CMakeLists.txt [wayland] Add a virtual framebuffer backend 2015-10-02 10:58:33 +02:00