9d49500245
Conflicts: CMakeLists.txt interfaces/terminal/example/CMakeLists.txt kdecore/CMakeLists.txt kdeui/actions/ktogglefullscreenaction.cpp kdeui/widgets/khelpmenu.cpp kio/kio/accessmanager.cpp kio/kio/accessmanagerreply_p.cpp nepomuk/core/nepomukmainmodel.cpp nepomuk/core/resourcedata.cpp nepomuk/core/resourcemanager.cpp nepomuk/query/andterm_p.h nepomuk/query/comparisonterm.cpp nepomuk/query/comparisonterm_p.h nepomuk/query/literalterm.cpp nepomuk/query/literalterm_p.h nepomuk/query/negationterm.cpp nepomuk/query/negationterm_p.h nepomuk/query/optionalterm.cpp nepomuk/query/optionalterm_p.h nepomuk/query/orterm.cpp nepomuk/query/orterm_p.h nepomuk/query/query.cpp nepomuk/query/resourceterm.cpp nepomuk/query/resourceterm_p.h nepomuk/query/resourcetypeterm.cpp nepomuk/query/resourcetypeterm_p.h nepomuk/query/term_p.h plasma/package.cpp plasma/private/service_p.h plasma/runnermanager.cpp staging/kwidgets/autotests/kiconloader_unittest.cpp tier1/kcoreaddons/src/caching/kshareddatacache.cpp tier1/kdbusaddons/src/kdbusinterprocesslock.cpp tier1/solid/src/solid/backends/fstab/fstabmanager.cpp tier1/solid/src/solid/backends/wmi/wmicdrom.cpp tier1/solid/src/solid/backends/wmi/wmidevice.cpp tier1/solid/src/solid/backends/wmi/wmimanager.cpp tier1/solid/src/solid/backends/wmi/wmiopticaldisc.cpp |
||
|---|---|---|
| .. | ||
| kconfigxt | ||
| knewstuff | ||
| operations | ||
| services | ||
| servicetypes | ||