Aaron Seigo 05834d8144 Merge remote-tracking branch 'origin/master' into libplasma2 ... Conflicts: plasma/CMakeLists.txt plasma/abstractrunner.h plasma/animator.h plasma/glapplet.h plasma/package.h plasma/packagemetadata.h plasma/packagestructure.h plasma/tooltipcontent.cpp plasma/tooltipcontent.h plasma/wallpaper.h		2011-07-11 21:56:41 +02:00
..
appletscript.cpp	export drawWallpaper and ContainmentType	2011-02-22 13:22:53 +01:00
appletscript.h	Replace doxygen tag @arg by @param.	2011-06-13 14:47:29 +02:00
dataenginescript.cpp	prevent infinite recursion	2010-08-06 03:42:46 +00:00
dataenginescript.h	revert the #include changes in public plasma headers, they break SC.	2010-11-10 21:38:04 +00:00
runnerscript.cpp	deprecate method is gone	2011-05-26 23:06:36 +02:00
runnerscript.h	deprecate method is gone	2011-05-26 23:06:36 +02:00
scriptengine.cpp	give datanegines their own package description; gets rid of various bits of cruft inherited unduly from PlasmoidPackage as well as adds a services/ dir for .operation files.	2010-08-06 01:28:09 +00:00
scriptengine.h	Replace doxygen tag @arg by @param.	2011-06-13 14:47:29 +02:00
wallpaperscript.cpp	shhh	2011-05-26 18:44:00 +02:00
wallpaperscript.h	remove the dropUrls approach	2011-05-18 15:08:07 +02:00