David Faure
fc73e05210
Merge remote-tracking branch 'origin/KDE/4.9' into frameworks
...
Conflicts:
CMakeLists.txt [versioning]
kio/kio/accessmanager.cpp [headers]
tier1/solid/src/solid/backends/wmi/wmiacadapter.cpp [Q_EMIT]
tier1/solid/src/solid/backends/wmi/wmibattery.cpp [Q_EMIT]
2012-07-02 15:53:39 +02:00
Script Kiddy
6efd9f1c99
SVN_SILENT made messages (.desktop file)
2012-06-26 19:13:32 +02:00
Stephen Kelly
13d5508112
Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
...
Conflicts:
CMakeLists.txt
kdecore/tests/kservicetest.cpp
kdeui/dialogs/kconfigdialog.h
kdeui/sonnet/configdialog.cpp
kdeui/widgets/kpushbutton.cpp
kdeui/widgets/kpushbutton.h
kio/kfile/kpropertiesdialog.cpp
nepomuk/core/resourcedata.cpp
nepomuk/core/resourcedata.h
nepomuk/core/resourcemanager.cpp
nepomuk/core/resourcemanager.h
nepomuk/core/resourcewatcher.cpp
nepomuk/core/resourcewatcher.h
nepomuk/query/queryparser.cpp
tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
tier1/solid/src/solid/backends/fstab/fstabstorageaccess.cpp
2012-03-04 21:01:22 +01:00
Script Kiddy
4d2620ca58
SVN_SILENT made messages (.desktop file)
2012-02-25 15:44:16 +01:00
David Faure
656d7a2d99
Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
...
Conflicts:
CMakeLists.txt (version)
plasma/data/services/plasma-applet-extenderapplet.desktop (deleted in frameworks)
2012-01-23 11:06:24 +01:00
Script Kiddy
aa2f54b8ae
SVN_SILENT made messages (.desktop file)
2012-01-19 09:08:22 +01:00
David Faure
8a2318f741
Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
...
Conflicts:
kfile/knewfilemenu.cpp
2012-01-16 14:25:19 +01:00
Script Kiddy
74b1a3e233
SVN_SILENT made messages (.desktop file)
2012-01-14 09:38:32 +01:00
David Faure
6a01732860
Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
...
Conflicts:
CMakeLists.txt [version number]
kdecore/tests/kcharsetstest.cpp [deleted]
2012-01-13 11:29:36 +01:00
Script Kiddy
10cd7b1aa7
SVN_SILENT made messages (.desktop file)
2012-01-07 09:21:08 +01:00
Script Kiddy
13e1fd98d5
SVN_SILENT made messages (.desktop file)
2012-01-05 09:16:55 +01:00
Script Kiddy
a229500102
SVN_SILENT made messages (.desktop file)
2012-01-03 16:53:17 +01:00
Script Kiddy
7126ebd18a
SVN_SILENT made messages (.desktop file)
2011-12-29 10:46:14 +01:00
David Faure
809bbd7b14
Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
...
Conflicts:
CMakeLists.txt
plasma/corona.h
plasma/data/services/plasma-applet-extenderapplet.desktop
plasma/data/servicetypes/plasma-packagestructure.desktop
2011-12-22 19:53:10 +01:00
Script Kiddy
f8c1d76547
SVN_SILENT made messages (.desktop file)
2011-12-22 11:44:55 +01:00
Script Kiddy
e01191b409
SVN_SILENT made messages (.desktop file)
2011-12-21 09:59:40 +01:00
Aaron Seigo
71d807c353
Merge remote branch 'origin/KDE/4.7' into frameworks
...
Conflicts:
CMakeLists.txt
kio/kfile/kfilemetadatareaderprocess.cpp
plasma/CMakeLists.txt
plasma/packagestructure.cpp
plasma/private/packages.cpp
threadweaver/Mainpage.dox
2011-12-04 14:25:38 +01:00
Script Kiddy
66f3acefb9
SVN_SILENT made messages (.desktop file)
2011-12-03 14:30:23 +01:00
Aaron Seigo
90b02f3973
massive step towards QGraphicsView being separated from libplasma
...
* remove extenders (never panned out, used by exactly two components that we can find .. anywhere)
* move animations to libplasmagqv
* schedule js anims to be put into the js scriptengine
* move all QGraphicsProxyWidgets, except for IconWidget which is still used by PopupApplet, into libplasmaqgv
* create a subclass-able private class for Applet
TODO: move out icon widget, address FIXMES in graphicswidgetappletprivate.cpp and decide how to register the "right" private class for instantiation in Applet ctors
2011-11-17 14:43:37 +01:00
Script Kiddy
fa9f077459
SVN_SILENT made messages (.desktop file)
2011-10-04 16:47:03 +02:00
Script Kiddy
a3ec982d01
SVN_SILENT made messages (.desktop file)
2011-10-01 15:12:18 +02:00
Alex Fiestas
9c4e522f8f
Merge branch 'KDE/4.7' into frameworks
2011-08-27 18:43:04 +02:00
Script Kiddy
02338c2bca
SVN_SILENT made messages (.desktop file)
2011-08-27 14:44:08 +02:00
Stephen Kelly
e23c2dfbd6
Merge remote-tracking branch 'origin/KDE/4.7' into frameworks
...
Conflicts:
CMakeLists.txt
cmake/modules/FindNepomuk.cmake
kdecore/tests/kstandarddirstest.cpp
kdeui/util/kkeyserver.h
kio/kio/accessmanagerreply_p.h
kio/kio/hostinfo.cpp
plasma/containment.cpp
plasma/data/services/plasma.protocol
plasma/popupapplet.cpp
plasma/tooltipcontent.h
plasma/widgets/videowidget.h
2011-08-25 19:43:08 +02:00
Script Kiddy
cd912280a0
SVN_SILENT made messages (.desktop file)
2011-08-25 14:16:14 +02:00
Script Kiddy
232c0a20bb
SVN_SILENT made messages (.desktop file)
2011-07-29 09:37:29 +02:00
Script Kiddy
dcce68643c
SVN_SILENT made messages (.desktop file)
2011-07-28 17:29:57 +02:00
Script Kiddy
7c3949f204
SVN_SILENT made messages (.desktop file)
2011-07-18 18:00:40 +02:00
Script Kiddy
d8215fbfd0
SVN_SILENT made messages (.desktop file)
2011-07-15 16:57:31 +02:00
Script Kiddy
4bda8b39bd
SVN_SILENT made messages (.desktop file)
2011-07-15 09:32:55 +02:00
Script Kiddy
6ba042db73
SVN_SILENT made messages (.desktop file)
2011-07-13 09:29:04 +02:00
Script Kiddy
b736b76203
SVN_SILENT made messages (.desktop file)
2011-07-07 18:43:55 +02:00
Script Kiddy
4af42a0986
SVN_SILENT made messages (.desktop file)
2011-07-06 19:16:46 +02:00
Script Kiddy
a13881b651
SVN_SILENT made messages (.desktop file)
2011-07-06 10:56:02 +02:00
Script Kiddy
4a14a7ce73
SVN_SILENT made messages (.desktop file)
2011-07-05 14:59:46 +02:00
Script Kiddy
bd843e3117
SVN_SILENT made messages (.desktop file)
2011-06-18 09:45:26 +02:00
Script Kiddy
f3ccce3494
SVN_SILENT made messages (.desktop file)
2011-06-15 10:03:54 +02:00
Script Kiddy
e897d67b4f
SVN_SILENT made messages (.desktop file)
2011-06-14 11:11:31 +02:00
Script Kiddy
401b4cbb6c
SVN_SILENT made messages (.desktop file)
2011-06-10 09:32:03 +02:00
Script Kiddy
72e0a4f957
SVN_SILENT made messages (.desktop file)
2011-06-09 09:02:57 +02:00
Script Kiddy
41211c2536
SVN_SILENT made messages (.desktop file)
2011-06-08 09:37:08 +02:00
Script Kiddy
4070c580a6
SVN_SILENT made messages (.desktop file)
2011-06-05 10:25:18 +02:00
Script Kiddy
68569d25fd
SVN_SILENT made messages (.desktop file)
2011-05-29 10:22:13 +02:00
Script Kiddy
7417ab8acb
SVN_SILENT made messages (.desktop file)
2011-05-24 11:18:16 +02:00
Script Kiddy
c63464c103
SVN_SILENT made messages (.desktop file)
2011-05-18 09:50:17 +02:00
Script Kiddy
4609c9eac7
SVN_SILENT made messages (.desktop file)
2011-05-17 11:08:10 +02:00
Script Kiddy
c7474c9028
SVN_SILENT made messages (.desktop file)
2011-05-16 09:49:35 +02:00
Script Kiddy
82926023b7
SVN_SILENT made messages (.desktop file)
2011-05-13 09:14:01 +02:00
Script Kiddy
4d5855c926
SVN_SILENT made messages (.desktop file)
2011-05-10 12:06:21 +02:00
Script Kiddy
f7393b34a5
SVN_SILENT made messages (.desktop file)
2011-05-09 09:47:35 +02:00