David Faure 76c6c3e483 Merge remote-tracking branch 'origin/master' into origin-frameworks ... Conflicts: kio/tests/krununittest.cpp [findExe] kparts/partmanager.cpp [moc] staging/kde4support/autotests/kmimetypetest.cpp [similar change already here] staging/kde4support/autotests/kmimetypetest.h [similar change already here] tier1/solid/src/solid/CMakeLists.txt [similar change already here]		2013-01-04 17:39:36 +01:00
..
declarativecontainment_p.cpp	remove wallpaper files	2012-11-21 15:30:50 +01:00
declarativecontainment_p.h	remove dependencies from WallPaper	2012-11-21 15:30:50 +01:00
declarativecontainment.cpp	remove dependencies from WallPaper	2012-11-21 15:30:50 +01:00
declarativecontainment.h	remove dependencies from WallPaper	2012-11-21 15:30:50 +01:00
declarativewidget.cpp	Merge remote-tracking branch 'origin/master' into origin-frameworks	2013-01-04 17:39:36 +01:00
declarativewidget.h	remove all widget files	2012-11-08 18:32:43 +01:00