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
..
2012-06-04 18:36:04 +02:00
2011-04-29 11:17:28 +02:00
2011-07-15 14:09:19 +02:00
2011-05-26 16:02:56 +02:00
2011-07-21 15:18:54 +02:00
2011-05-26 17:22:48 +02:00
2011-04-29 11:17:31 +02:00
2011-04-29 11:17:31 +02:00
2008-11-03 23:08:39 +00:00