d930917d95
Conflicts: CMakeLists.txt kdecore/tests/kstandarddirstest.cpp kdecore/tests/kurltest.cpp kdeui/actions/kaction.cpp kdeui/tests/CMakeLists.txt kio/kio/krun.cpp nepomuk/core/nepomukmainmodel.cpp [gone] nepomuk/core/resourcedata.cpp [gone] nepomuk/core/resourcemanager.cpp [gone] nepomuk/core/resourcemanager_p.h [gone] staging/kde4support/autotests/kmimetypetest.cpp [splitted out] staging/kwidgets/src/utils/kglobalsettings.cpp tier1/itemmodels/src/kviewstateserializer.cpp |
||
---|---|---|
.. | ||
kconfigxt | ||
knewstuff | ||
operations | ||
services | ||
servicetypes |