alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,288 Commits 1 Branch 0 Tags 40 MiB
21a5833090
Commit Graph

144 Commits

Author SHA1 Message Date
Stephen Kelly
9d49500245 Merge remote-tracking branch 'origin/KDE/4.8' into frameworks 
Conflicts:
	CMakeLists.txt
	interfaces/terminal/example/CMakeLists.txt
	kdecore/CMakeLists.txt
	kdeui/actions/ktogglefullscreenaction.cpp
	kdeui/widgets/khelpmenu.cpp
	kio/kio/accessmanager.cpp
	kio/kio/accessmanagerreply_p.cpp
	nepomuk/core/nepomukmainmodel.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/core/resourcemanager.cpp
	nepomuk/query/andterm_p.h
	nepomuk/query/comparisonterm.cpp
	nepomuk/query/comparisonterm_p.h
	nepomuk/query/literalterm.cpp
	nepomuk/query/literalterm_p.h
	nepomuk/query/negationterm.cpp
	nepomuk/query/negationterm_p.h
	nepomuk/query/optionalterm.cpp
	nepomuk/query/optionalterm_p.h
	nepomuk/query/orterm.cpp
	nepomuk/query/orterm_p.h
	nepomuk/query/query.cpp
	nepomuk/query/resourceterm.cpp
	nepomuk/query/resourceterm_p.h
	nepomuk/query/resourcetypeterm.cpp
	nepomuk/query/resourcetypeterm_p.h
	nepomuk/query/term_p.h
	plasma/package.cpp
	plasma/private/service_p.h
	plasma/runnermanager.cpp
	staging/kwidgets/autotests/kiconloader_unittest.cpp
	tier1/kcoreaddons/src/caching/kshareddatacache.cpp
	tier1/kdbusaddons/src/kdbusinterprocesslock.cpp
	tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
	tier1/solid/src/solid/backends/wmi/wmicdrom.cpp
	tier1/solid/src/solid/backends/wmi/wmidevice.cpp
	tier1/solid/src/solid/backends/wmi/wmimanager.cpp
	tier1/solid/src/solid/backends/wmi/wmiopticaldisc.cpp
 2012-06-16 13:40:47 +02:00
Script Kiddy
d68f439477 SVN_SILENT made messages (.desktop file) 2012-05-11 15:12:49 +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
fd2357e7d9 SVN_SILENT made messages (.desktop file) 2012-01-20 10:46:57 +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
1b541d478e SVN_SILENT made messages (.desktop file) 2012-01-06 08:39:57 +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
5727ade508 Merge remote branch 'origin/KDE/4.7' into frameworks 
Conflicts:
	kio/kfile/kfilemetadatareaderprocess.cpp
 2011-11-28 11:00:27 +01:00
Script Kiddy
b71636fb5b SVN_SILENT made messages (.desktop file) 2011-11-22 21:19:16 +01:00
Aaron Seigo
2c7751ccef Merge remote-tracking branch 'origin/KDE/4.7' into frameworks 
Conflicts:
	CMakeLists.txt
	kio/kio/kfileitem.cpp
	plasma/datacontainer.cpp
	plasma/datacontainer.h
	plasma/private/wallpaper_p.h
	plasma/private/wallpaperrenderthread.cpp
 2011-10-30 10:44:59 +01:00
Script Kiddy
4cc0c2fbd6 SVN_SILENT made messages (.desktop file) 2011-10-22 14:56:58 +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
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
Aaron Seigo
c16dffd1e7 the rest of the fallout from the package changes 2011-07-15 13:35:58 +02:00
Aaron Seigo
208e4853bd removal of includes, renamining of .dekstop file 2011-07-14 13:19:03 +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
41211c2536 SVN_SILENT made messages (.desktop file) 2011-06-08 09:37:08 +02:00
Script Kiddy
68569d25fd SVN_SILENT made messages (.desktop file) 2011-05-29 10:22:13 +02:00
Script Kiddy
4d5855c926 SVN_SILENT made messages (.desktop file) 2011-05-10 12:06:21 +02:00
Script Kiddy
3eba58f795 SVN_SILENT made messages (.desktop file) 2011-05-08 09:42:51 +02:00
Script Kiddy
38fd4f487f SVN_SILENT made messages (.desktop file) 2011-04-30 09:25:22 +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
Script Kiddy
9d98ff105b SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1215894
 2011-01-20 06:12:54 +00:00
Script Kiddy
e33f5ea828 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1215657
 2011-01-19 06:34:21 +00:00
Script Kiddy
a6dc2ba624 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1214745
 2011-01-16 05:46:29 +00:00
Script Kiddy
20b98d1bef SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1214526
 2011-01-15 05:49:44 +00:00
Script Kiddy
904ad74970 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1214317
 2011-01-14 06:01:34 +00:00
Script Kiddy
9494527c60 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1213673
 2011-01-11 09:13:33 +00:00
Script Kiddy
f0793a0126 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1207961
 2010-12-20 06:27:11 +00:00
Script Kiddy
5fe66eb33b SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdelibs/; revision=1207225
 2010-12-17 06:25:45 +00:00