plasma-framework

History

Marco Martin 33e9192346 Merge branch 'libplasma2' into frameworks

Conflicts:
	plasma/CMakeLists.txt
	plasma/popupapplet.cpp

2011-08-12 11:45:49 +02:00

appletscript.cpp

2011-07-29 15:46:52 +02:00

appletscript.h

2011-07-15 13:04:16 +02:00

dataenginescript.cpp

2011-07-15 13:04:16 +02:00

dataenginescript.h

2011-07-15 13:04:16 +02:00

runnerscript.cpp

2011-07-15 13:04:16 +02:00

runnerscript.h

2011-07-15 13:04:16 +02:00

scriptengine.cpp

2011-08-12 11:45:49 +02:00

scriptengine.h

2011-07-15 13:04:16 +02:00

wallpaperscript.cpp

2011-07-15 13:04:16 +02:00

wallpaperscript.h

2011-07-15 13:04:16 +02:00