plasma-framework/tests/testcontainmentactionsplugin
David Faure fc73e05210 Merge remote-tracking branch 'origin/KDE/4.9' into frameworks
Conflicts:
	CMakeLists.txt [versioning]
	kio/kio/accessmanager.cpp [headers]
	tier1/solid/src/solid/backends/wmi/wmiacadapter.cpp [Q_EMIT]
	tier1/solid/src/solid/backends/wmi/wmibattery.cpp [Q_EMIT]
2012-07-02 15:53:39 +02:00
..
2010-08-04 19:38:31 +00:00
2009-08-18 07:16:19 +00:00
2009-08-17 23:40:25 +00:00