plasma-framework/data
David Faure 6a01732860 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
Conflicts:
	CMakeLists.txt [version number]
	kdecore/tests/kcharsetstest.cpp [deleted]
2012-01-13 11:29:36 +01: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.8' into origin-frameworks 2012-01-13 11:29:36 +01:00
servicetypes Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 2012-01-13 11:29:36 +01:00