Stephen Kelly
13d5508112
Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
Conflicts:
CMakeLists.txt
kdecore/tests/kservicetest.cpp
kdeui/dialogs/kconfigdialog.h
kdeui/sonnet/configdialog.cpp
kdeui/widgets/kpushbutton.cpp
kdeui/widgets/kpushbutton.h
kio/kfile/kpropertiesdialog.cpp
nepomuk/core/resourcedata.cpp
nepomuk/core/resourcedata.h
nepomuk/core/resourcemanager.cpp
nepomuk/core/resourcemanager.h
nepomuk/core/resourcewatcher.cpp
nepomuk/core/resourcewatcher.h
nepomuk/query/queryparser.cpp
tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
tier1/solid/src/solid/backends/fstab/fstabstorageaccess.cpp