l10n daemon script 57ea28a216 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-11-14 05:58:20 +01:00
..
drm	Fix viewport on vertically stacked monitors	2017-10-25 23:13:44 +01:00
fbdev
hwcomposer
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-14 05:58:20 +01:00
wayland	Make AbstractEglBackend a QObject	2017-09-07 19:25:28 +02:00
x11	Don't use the global KConfig object on the OpenGL freeze detection thread	2017-11-05 10:25:24 +01:00
CMakeLists.txt