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

..

CMakeLists.txt

allow it to be built separately

2010-08-04 19:38:31 +00:00

config.ui

Fix ui files

2009-08-18 07:16:19 +00:00

plasma-containmentactions-test.desktop

SVN_SILENT made messages (.desktop file)

2012-08-06 09:28:55 +02:00

test.cpp

Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks

2012-02-14 12:32:25 +01:00

test.h

rename folder

2009-08-17 23:40:25 +00:00