05834d8144
Conflicts: plasma/CMakeLists.txt plasma/abstractrunner.h plasma/animator.h plasma/glapplet.h plasma/package.h plasma/packagemetadata.h plasma/packagestructure.h plasma/tooltipcontent.cpp plasma/tooltipcontent.h plasma/wallpaper.h