bdb7251250
Conflicts: CMakeLists.txt [version] README [version] cmake/modules/CMakeLists.txt cmake/modules/FindKDE4Internal.cmake cmake/modules/FindNepomuk.cmake [git replaying an old conflict!] cmake/modules/KDE4Macros.cmake [automoc4 stuff, reverted] interfaces/ktexteditor/* [moved out] kdecore/services/kmimetype.cpp [hand-merged into kio/global.cpp] kdeui/util/kkeyserver.h kdeui/widgets/ktextedit.cpp kdewebkit/kwebwallet.cpp khtml/misc/enum.h [git got confused, me thinks] kio/kio/accessmanager.cpp kio/kio/hostinfo.cpp kio/kio/kprotocolmanager.cpp kio/kio/kprotocolmanager.h kioslave/http/http.cpp kioslave/http/http.h kioslave/http/tests/CMakeLists.txt kioslave/http/tests/httpheaderdispositiontest.cpp nepomuk/core/* [moved out] plasma/CMakeLists.txt plasma/applet.cpp plasma/applet.h plasma/dialog.cpp plasma/packagestructure.cpp plasma/popupapplet.cpp plasma/private/applethandle.cpp plasma/private/packages.cpp plasma/private/tooltip.cpp plasma/tooltipmanager.cpp plasma/widgets/videowidget.h staging/ki18n/src/klocalizedstring.cpp staging/kservice/autotests/kservicetest.cpp staging/kwidgets/src/utils/kglobalsettings.cpp tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.cpp tier1/solid/src/solid/backends/upower/upoweracadapter.cpp tier1/solid/src/solid/backends/upower/upowerbattery.cpp |
||
|---|---|---|
| .. | ||
| declarativecontainment_p.cpp | ||
| declarativecontainment_p.h | ||
| declarativecontainment.cpp | ||
| declarativecontainment.h | ||
| declarativewidget.cpp | ||
| declarativewidget.h | ||