8eb06eee32
Conflicts: CMakeLists.txt cmake/modules/FindNepomuk.cmake kdecore/tests/kservicetest.cpp kdeui/util/kkeyserver.h kio/kio/accessmanagerreply_p.h kio/kio/hostinfo.cpp kioslave/http/http.h kioslave/http/httpauthentication.cpp kioslave/http/httpauthentication.h kioslave/http/tests/httpauthenticationtest.cpp kioslave/http/tests/httpheaderdispositiontest.cpp kparts/browseropenorsavequestion.cpp plasma/data/services/plasma.protocol plasma/wallpaper.cpp plasma/widgets/videowidget.h solid/solid/backends/wmi/wmiquery.cpp |
||
---|---|---|
.. | ||
kconfig_updates | ||
kconfigxt | ||
knewstuff | ||
operations | ||
services | ||
servicetypes |