Stephen Kelly b8f345c3e2 Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
Conflicts:
	kdeui/widgets/kdatecombobox.cpp
	kfile/knewfilemenu.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/core/resourcewatcher.cpp
	nepomuk/core/resourcewatcher.h
	tier1/kcoreaddons/src/caching/kshareddatacache.cpp
2012-03-15 23:33:05 +01:00
..
2008-11-07 18:04:32 +00:00
2012-02-10 19:59:05 +01:00
2012-02-10 19:59:05 +01:00
2009-09-13 17:17:02 +00:00