Commit Graph

162 Commits

Author SHA1 Message Date
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
Aaron Seigo
7c8cf530e1 Merge remote-tracking branch 'origin/master' into libplasma2
Conflicts:
	plasma/theme.cpp
2011-07-30 20:20:10 +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
Aaron Seigo
bd10c7175e Merge remote-tracking branch 'origin/master' into libplasma2
Conflicts:
	plasma/containment.cpp
	plasma/package.cpp
	plasma/packagestructure.cpp
	plasma/private/package_p.h
	plasma/scripting/scriptengine.cpp
2011-07-21 15:31:07 +02:00
Aaron Seigo
240a7b1ebb and we're package to package-plasmastructure.desktop 2011-07-19 21:52:47 +02:00
Aaron Seigo
933e72092a add ContainmentActions to PluginLoader 2011-07-19 21:39:51 +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
Aaron Seigo
c16dffd1e7 the rest of the fallout from the package changes 2011-07-15 13:35:58 +02:00
Script Kiddy
4bda8b39bd SVN_SILENT made messages (.desktop file) 2011-07-15 09:32:55 +02:00
Aaron Seigo
208e4853bd removal of includes, renamining of .dekstop file 2011-07-14 13:19:03 +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
Script Kiddy
3eba58f795 SVN_SILENT made messages (.desktop file) 2011-05-08 09:42:51 +02:00
Script Kiddy
dbccc42f45 SVN_SILENT made messages (.desktop file) 2011-05-07 09:21:47 +02:00
Script Kiddy
9bf34b2194 SVN_SILENT made messages (.desktop file) 2011-05-05 08:59:59 +02:00
Script Kiddy
062b6e7c68 SVN_SILENT made messages (.desktop file) 2011-05-04 09:06:54 +02:00
Script Kiddy
39633fa140 SVN_SILENT made messages (.desktop file) 2011-05-02 09:32:12 +02:00
Script Kiddy
360e8c5928 SVN_SILENT made messages (.desktop file) 2011-05-01 09:39:13 +02:00
Script Kiddy
38fd4f487f SVN_SILENT made messages (.desktop file) 2011-04-30 09:25:22 +02:00
Kevin Ottens
ed014e6c91 Add description for the plasma protocol
We now support publicly plasma:// URLs, so add a protocol file which
calls the plasma-remote-helper application to deal with such URLs.
Particularly handy from the network:// ioslave which exposes Plasma
remote widgets.

REVIEW: 1515
2011-04-29 16:55:42 +02:00
Script Kiddy
214a8eb3ad SVN_SILENT made messages (.desktop file) 2011-04-13 08:59:18 +02:00
Script Kiddy
e637d4268f SVN_SILENT made messages (.desktop file) 2011-03-16 08:31:08 +01:00
Script Kiddy
fcd254345c SVN_SILENT made messages (.desktop file) 2011-03-12 08:40:20 +01:00
Script Kiddy
75d4361505 SVN_SILENT made messages (.desktop file) 2011-03-07 08:20:35 +01:00
Script Kiddy
fb98c62ee8 SVN_SILENT made messages (.desktop file) 2011-02-14 16:33:43 +01:00
Script Kiddy
2a65dfbf5e SVN_SILENT made messages (.desktop file) 2011-02-04 06:47:25 +01:00
Script Kiddy
94792358f9 SVN_SILENT made messages (.desktop file) 2011-02-02 08:27:17 +01:00