David Faure
d930917d95
Merge remote-tracking branch 'origin/KDE/4.9' into frameworks
Conflicts:
CMakeLists.txt
kdecore/tests/kstandarddirstest.cpp
kdecore/tests/kurltest.cpp
kdeui/actions/kaction.cpp
kdeui/tests/CMakeLists.txt
kio/kio/krun.cpp
nepomuk/core/nepomukmainmodel.cpp [gone]
nepomuk/core/resourcedata.cpp [gone]
nepomuk/core/resourcemanager.cpp [gone]
nepomuk/core/resourcemanager_p.h [gone]
staging/kde4support/autotests/kmimetypetest.cpp [splitted out]
staging/kwidgets/src/utils/kglobalsettings.cpp
tier1/itemmodels/src/kviewstateserializer.cpp
2012-07-20 15:10:26 +02:00
..
2012-02-08 23:34:07 +01:00
2012-02-02 10:35:53 +01:00
2012-06-20 00:38:04 +02:00
2012-02-02 10:35:53 +01:00
2012-07-16 21:35:17 +02:00
2012-02-02 10:35:53 +01:00
2012-07-16 21:35:17 +02:00
2012-02-02 10:35:53 +01:00
2012-02-08 23:34:07 +01:00
2012-02-02 10:35:53 +01:00
2012-06-20 00:38:04 +02:00
2012-02-02 10:35:53 +01:00
2012-06-20 00:38:04 +02:00
2012-02-02 10:35:53 +01:00
2012-02-02 10:35:53 +01:00
2012-06-20 00:38:04 +02:00
2012-04-28 13:17:42 +02:00
2012-02-08 23:34:07 +01:00
2012-02-02 10:35:53 +01:00
2012-06-20 00:38:04 +02:00
2012-02-02 10:35:53 +01:00
2012-07-16 21:35:17 +02:00
2012-07-07 03:11:37 +02:00
2008-11-07 18:04:32 +00:00
2012-06-26 19:27:14 +02:00
2012-02-02 10:35:53 +01:00
2012-07-16 21:35:17 +02:00
2012-04-28 13:17:42 +02:00
2012-06-20 00:38:04 +02:00
2012-02-02 10:35:53 +01:00
2012-07-16 21:35:17 +02:00
2012-02-02 10:35:53 +01:00
2012-06-20 00:38:04 +02:00
2012-02-02 10:35:53 +01:00
2012-02-08 23:34:07 +01:00
2012-02-02 10:35:53 +01:00
2012-02-08 23:34:07 +01:00
2012-02-02 10:35:53 +01:00
2012-07-16 21:35:17 +02:00
2012-02-02 10:35:53 +01:00
2012-07-16 21:35:17 +02:00
2012-02-02 10:35:53 +01:00
2012-02-08 23:34:07 +01:00
2012-02-02 10:35:53 +01:00
2012-07-16 21:35:17 +02:00
2012-02-02 10:35:53 +01:00
2012-07-16 21:35:17 +02:00
2012-02-02 10:35:53 +01:00
2012-07-16 21:35:17 +02:00
2012-02-02 10:35:53 +01:00
2012-06-20 00:38:04 +02:00
2012-07-20 15:10:26 +02:00
2012-07-16 21:35:17 +02:00
2012-02-02 10:35:53 +01:00
2012-04-28 13:17:42 +02:00
2012-02-02 10:35:53 +01:00
2012-07-16 21:35:17 +02:00
2012-02-02 10:35:53 +01:00
2009-09-13 17:17:02 +00:00
2012-06-08 17:33:16 +02:00