alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
99309b3695
plasma-framework/tests/testcontainmentactionsplugin
History
Stephen Kelly 13d5508112 Merge remote-tracking branch 'origin/KDE/4.8' into frameworks 
Conflicts:
	CMakeLists.txt
	kdecore/tests/kservicetest.cpp
	kdeui/dialogs/kconfigdialog.h
	kdeui/sonnet/configdialog.cpp
	kdeui/widgets/kpushbutton.cpp
	kdeui/widgets/kpushbutton.h
	kio/kfile/kpropertiesdialog.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/core/resourcedata.h
	nepomuk/core/resourcemanager.cpp
	nepomuk/core/resourcemanager.h
	nepomuk/core/resourcewatcher.cpp
	nepomuk/core/resourcewatcher.h
	nepomuk/query/queryparser.cpp
	tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
	tier1/solid/src/solid/backends/fstab/fstabstorageaccess.cpp
2012-03-04 21:01:22 +01: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-02-25 15:44:16 +01: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