David Faure 3e623699ce Merge remote-tracking branch 'origin/KDE/4.10' into frameworks
Conflicts:
	kdecore/services/kmimeglobsfileparser.cpp [whole file is gone]
	kdecore/sycoca/kprotocolinfo.cpp [rewritten in kio; hand-merged]
	kdeui/widgets/kmainwindow.cpp [geometry handling, code is gone]
	kfile/kfileplacesitem.cpp
	kio/kio/kfileitem.cpp [tons of kurl/qmimetype differences for the big if(!d) patch]
	kio/tests/kfileitemtest.cpp [kurl]
	plasma/private/applethandle.cpp [namespace]
	plasma/runnermanager.cpp
	staging/kservice/src/services/kservicetypetrader.h [i18n]
2012-10-30 19:53:28 +01:00
..
2012-08-24 03:16:04 +02:00
2011-05-31 01:00:35 +02:00
2012-09-24 15:52:16 +02:00
2012-10-10 19:07:06 +02:00
2010-01-18 18:24:57 +00:00
2012-03-11 10:34:38 +01:00
2012-03-11 10:34:38 +01:00
2012-03-11 10:34:38 +01:00
2012-03-11 10:34:38 +01:00
2012-08-24 03:16:04 +02:00
2012-08-06 00:27:15 +02:00
2011-06-09 12:46:25 +02:00