kwin/backends
l10n daemon script 22da928d2b 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-13 10:44:04 +00:00
..
drm SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-13 10:44:04 +00:00
fbdev SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-13 10:44:04 +00:00
hwcomposer SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-13 10:44:04 +00:00
virtual SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-13 10:44:04 +00:00
wayland SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-13 10:44:04 +00:00
x11 SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-13 10:44:04 +00:00
CMakeLists.txt [wayland] Add a virtual framebuffer backend 2015-10-02 10:58:33 +02:00