David Faure 6620a16b73 Merge remote-tracking branch 'origin/KDE/4.10' into frameworks
Conflicts:
	kdeui/fonts/kfontchooser.cpp [same mess as in master]
	kdeui/jobs/kdialogjobuidelegate.cpp [moc]
	kjs/tests/ecmatest_broken_ch15 [rename/rename]
	kjs/tests/ecmatest_broken_ch15.2 [rename/rename]
	nepomuk/core/resourcedata.cpp [gone]
	nepomuk/core/resourcewatcher.cpp [gone]
	nepomuk/core/resourcewatcher.h [gone]
	tier1/kjs/autotests/ecmatest_broken_ch15 [rename/rename]
2012-09-16 11:44:07 +02:00
..
2012-04-28 13:17:42 +02:00
2008-11-07 18:04:32 +00:00
2012-04-28 13:17:42 +02:00
2012-08-24 03:16:04 +02:00
2012-08-24 03:16:04 +02:00
2012-06-08 17:33:16 +02:00