Conflicts: plasma/containment.cpp plasma/package.cpp plasma/packagestructure.cpp plasma/private/package_p.h plasma/scripting/scriptengine.cpp |
||
---|---|---|
.. | ||
kconfig_updates | ||
kconfigxt | ||
knewstuff | ||
operations | ||
services | ||
servicetypes |
Conflicts: plasma/containment.cpp plasma/package.cpp plasma/packagestructure.cpp plasma/private/package_p.h plasma/scripting/scriptengine.cpp |
||
---|---|---|
.. | ||
kconfig_updates | ||
kconfigxt | ||
knewstuff | ||
operations | ||
services | ||
servicetypes |