alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.8' into frameworks

Browse Source 
Conflicts:
	kdecore/jobs/kjob.h
	kdecore/kernel/kcmdlineargs.cpp
	kdewebkit/kwebpluginfactory.cpp
	plasma/service.cpp
	solid/solid/CMakeLists.txt
	solid/solid/backends/udev/udevdevice.cpp
	solid/solid/backends/udev/udevmanager.cpp
	solid/solid/backends/udev/udevportablemediaplayer.cpp
This commit is contained in:
Stephen Kelly 2012-04-29 12:59:31 +02:00
commit c8d2e51e43
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service.cpp
View File

@ -237,7 +237,7 @@ ServiceJob *Service::startOperationCall(const KConfigGroup &description, QObject
} }
} else { } else {
#ifndef NDEBUG #ifndef NDEBUG
kDebug() << "Not a valid group!"<<d->config->groupList(); kDebug() << op << "is not a valid group; valid groups are:" << d->config->groupList();
#endif #endif
} }