David Faure fa8d1046ef Merge remote-tracking branch 'origin/KDE/4.10' into frameworks ... Conflicts: CMakeLists.txt [version number] cmake/modules/KDE4Macros.cmake [modifications to dead code] interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop [deleted] interfaces/ktexteditor/ktexteditorplugin.desktop [deleted] kparts/tests/partviewer.cpp [includes] nepomuk/core/nepomukmainmodel.cpp [deleted] nepomuk/core/resource.cpp [deleted] nepomuk/test/CMakeLists.txt [deleted] tier1/kcoreaddons/src/io/klockfile_unix.cpp [already fixed] tier1/solid/src/solid/backends/hal/halmanager.cpp [modifications to dead code, AFAICS]		2012-08-16 13:24:21 +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.10' into frameworks	2012-08-16 13:24:21 +02:00