Conflicts: kio/tests/krununittest.cpp [findExe] kparts/partmanager.cpp [moc] staging/kde4support/autotests/kmimetypetest.cpp [similar change already here] staging/kde4support/autotests/kmimetypetest.h [similar change already here] tier1/solid/src/solid/CMakeLists.txt [similar change already here] |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
plasma-dataengine-testengine.desktop | ||
testengine.cpp | ||
testengine.h |