Martin Gräßlin 5543cfdf68 Merge branch 'Plasma/5.8'		2016-10-10 16:59:55 +02:00
..
drm	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-05 09:29:10 +00:00
fbdev	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-05 09:29:10 +00:00
hwcomposer	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-05 09:29:10 +00:00
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-05 09:29:10 +00:00
wayland	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-05 09:29:10 +00:00
x11	Merge branch 'Plasma/5.8'	2016-10-10 16:59:55 +02:00
CMakeLists.txt