plasma-framework/data
David Faure d930917d95 Merge remote-tracking branch 'origin/KDE/4.9' into frameworks
Conflicts:
	CMakeLists.txt
	kdecore/tests/kstandarddirstest.cpp
	kdecore/tests/kurltest.cpp
	kdeui/actions/kaction.cpp
	kdeui/tests/CMakeLists.txt
	kio/kio/krun.cpp
	nepomuk/core/nepomukmainmodel.cpp [gone]
	nepomuk/core/resourcedata.cpp [gone]
	nepomuk/core/resourcemanager.cpp [gone]
	nepomuk/core/resourcemanager_p.h [gone]
	staging/kde4support/autotests/kmimetypetest.cpp [splitted out]
	staging/kwidgets/src/utils/kglobalsettings.cpp
	tier1/itemmodels/src/kviewstateserializer.cpp
2012-07-20 15:10:26 +02:00
..
kconfigxt we'll need another file for the app specific values, so make these -global 2009-10-07 18:44:07 +00:00
knewstuff only use scripted plasmoids as downloads 2010-02-24 00:29:37 +00:00
operations new operations for Storage: 2010-11-02 22:05:48 +00:00
services Merge remote-tracking branch 'origin/KDE/4.9' into frameworks 2012-07-02 15:53:39 +02:00
servicetypes Merge remote-tracking branch 'origin/KDE/4.9' into frameworks 2012-07-20 15:10:26 +02:00