David Faure
083d157684
Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
Conflicts:
kdecore/network/k3datagramsocket.cpp
kdeui/actions/kstandardaction.cpp
kdeui/dialogs/kconfigdialogmanager.cpp
kdeui/icons/kicondialog.cpp
kdeui/itemviews/kviewstatesaver.h
kfile/knewfilemenu.cpp
kio/misc/kpac/downloader.cpp
kio/tests/kdirlistertest.cpp
kparts/browserextension.cpp
nepomuk/core/nepomukmainmodel.cpp
nepomuk/query/queryserviceclient.cpp
nepomuk/test/ratingpaintertestwidget.cpp
nepomuk/ui/kedittagsdialog.cpp
nepomuk/ui/ktagcloudwidget.cpp
nepomuk/ui/ktagdisplaywidget.cpp
nepomuk/ui/nepomukmassupdatejob.cpp
nepomuk/ui/tagwidget.cpp
nepomuk/utils/daterangeselectionwidget.cpp
nepomuk/utils/facetwidget.cpp
nepomuk/utils/searchwidget.cpp
plasma/containment.cpp
plasma/datacontainer.cpp
plasma/deprecated/animator.cpp
plasma/extenders/extender.cpp
plasma/plasma.h
plasma/scripting/wallpaperscript.cpp
tier1/solid/tests/networkingclient.cpp
(signal/slot normalization changes conflicted with KUrl->QUrl changes
and with other changes in frameworks)
2012-02-14 12:32:25 +01:00
..
2010-10-25 15:03:54 +00:00
2011-11-17 14:43:37 +01:00
2012-02-14 12:32:25 +01:00
2009-12-27 22:16:11 +00:00
2011-05-31 00:03:39 +02:00
2011-05-31 01:00:35 +02:00
2011-01-11 02:55:55 +00:00
2012-02-02 10:35:53 +01:00
2012-02-02 10:35:53 +01:00
2009-12-27 22:16:11 +00:00
2011-12-08 19:06:24 +01:00
2012-02-02 10:35:53 +01:00
2012-02-07 12:38:06 +01:00
2009-09-16 17:08:45 +00:00
2012-02-13 14:27:21 -05:00
2011-08-03 10:21:39 +02:00
2011-08-03 10:21:39 +02:00
2009-01-06 17:06:26 +00:00
2011-11-22 12:56:16 +01:00
2011-07-15 13:02:15 +02:00
2009-10-05 20:50:57 +00:00
2011-05-27 12:07:12 +02:00
2012-02-08 23:34:07 +01:00
2011-10-30 10:44:59 +01:00
2011-11-30 12:58:20 +01:00
2011-06-03 13:13:19 +02:00
2011-04-30 12:43:29 +02:00
2009-10-20 19:15:32 +00:00
2012-01-31 22:44:36 +01:00
2011-05-26 19:01:44 +02:00
2012-01-31 22:44:36 +01:00
2011-12-16 14:57:20 +01:00
2011-12-08 12:54:28 +01:00
2012-01-31 22:44:36 +01:00
2011-11-08 12:57:46 +01:00
2012-02-08 23:34:07 +01:00
2010-09-27 18:16:27 +00:00
2011-05-26 19:01:44 +02:00
2012-01-31 22:44:36 +01:00
2010-01-18 18:24:57 +00:00
2010-02-22 11:21:30 +00:00
2012-02-13 14:27:21 -05:00
2010-01-27 02:50:47 +00:00
2011-05-04 14:12:33 +02:00
2012-01-31 22:44:36 +01:00
2011-08-31 12:53:09 +02:00
2011-11-30 12:58:20 +01:00
2012-01-31 22:44:36 +01:00
2011-10-04 16:52:38 +02:00
2012-01-31 22:44:36 +01:00
2011-12-20 11:57:49 +01:00
2009-11-15 13:41:00 +00:00
2011-05-05 14:52:55 +02:00
2012-01-31 22:44:36 +01:00
2011-05-26 19:01:44 +02:00
2012-02-14 12:32:25 +01:00
2011-05-26 19:01:44 +02:00
2011-07-29 15:46:52 +02:00
2011-11-22 12:17:06 +01:00
2012-01-31 22:44:36 +01:00
2011-06-03 13:16:35 +02:00
2011-05-26 19:01:44 +02:00
2011-05-11 21:46:35 -06:00
2012-02-14 12:32:25 +01:00
2008-11-03 23:08:39 +00:00
2011-09-28 17:44:59 +02:00
2012-02-14 12:32:25 +01:00
2011-09-19 11:27:54 +02:00
2012-01-31 22:44:36 +01:00
2012-02-02 10:35:53 +01:00
2012-01-31 22:44:36 +01:00
2010-12-18 08:54:17 +00:00
2011-12-04 14:00:32 +01:00
2012-01-31 22:44:36 +01:00
2009-12-02 12:23:56 +00:00
2012-01-31 22:44:36 +01:00
2011-10-30 10:44:59 +01:00
2011-10-30 10:24:57 +01:00
2012-01-31 22:44:36 +01:00
2009-12-24 14:54:48 +00:00
2012-01-31 22:44:36 +01:00
2011-06-09 12:46:25 +02:00
2012-01-31 22:44:36 +01:00